[6.4] Fix various @psalm-return annotations

nicolas-grekas · nicolas-grekas · commit 7c0b00c86148 · 2023-06-30T11:12:50.000+02:00
diff --git a/src/Symfony/Component/Console/Completion/CompletionInput.php b/src/Symfony/Component/Console/Completion/CompletionInput.php
@@ -141,7 +141,9 @@ public function bind(InputDefinition $definition): void
      * TYPE_OPTION_NAME    when completing the name of an input option
      * TYPE_NONE           when nothing should be completed
      *
-     * @return string One of self::TYPE_* constants. TYPE_OPTION_NAME and TYPE_NONE are already implemented by the Console component
+     * TYPE_OPTION_NAME and TYPE_NONE are already implemented by the Console component.
+     *
+     * @return self::TYPE_*
      */
     public function getCompletionType(): string
     {
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -176,7 +176,7 @@ public function resolve()
      * @param TValue $value
      * @param array  $resolving An array of keys that are being resolved (used internally to detect circular references)
      *
-     * @return (TValue is scalar ? array|scalar : array<array|scalar>)
+     * @psalm-return (TValue is scalar ? array|scalar : array<array|scalar>)
      *
      * @throws ParameterNotFoundException          if a placeholder references a parameter that does not exist
      * @throws ParameterCircularReferenceException if a circular reference if detected

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,9 @@ public function bind(InputDefinition $definition): void`
`141`	`141`	`* TYPE_OPTION_NAME when completing the name of an input option`
`142`	`142`	`* TYPE_NONE when nothing should be completed`
`143`	`143`	`*`
`144`		`- * @return string One of self::TYPE_* constants. TYPE_OPTION_NAME and TYPE_NONE are already implemented by the Console component`
	`144`	`+ * TYPE_OPTION_NAME and TYPE_NONE are already implemented by the Console component.`
	`145`	`+ *`
	`146`	`+ * @return self::TYPE_*`
`145`	`147`	`*/`
`146`	`148`	`public function getCompletionType(): string`
`147`	`149`	`{`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function resolve()`
`176`	`176`	`* @param TValue $value`
`177`	`177`	`* @param array $resolving An array of keys that are being resolved (used internally to detect circular references)`
`178`	`178`	`*`
`179`		`- * @return (TValue is scalar ? array\|scalar : array<array\|scalar>)`
	`179`	`+ * @psalm-return (TValue is scalar ? array\|scalar : array<array\|scalar>)`
`180`	`180`	`*`
`181`	`181`	`* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist`
`182`	`182`	`* @throws ParameterCircularReferenceException if a circular reference if detected`