[HttpKernel] Refine ControllerEvent::getAttributes() and ControllerArgumentsEvent::getAttributes() return types

7-zete-7 · 7-zete-7 · commit 533abf44280a · 2025-09-12T15:10:12.000+03:00
diff --git a/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php b/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php
@@ -97,13 +97,11 @@ public function getNamedArguments(): array
     }
 
     /**
-     * @template T of class-string|null
+     * @template T of object
      *
-     * @param T $className
+     * @param class-string<T>|null $className
      *
-     * @return array<class-string, list<object>>|list<object>
-     *
-     * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)
+     * @return ($className is null ? array<class-string, list<object>> : list<T>)
      */
     public function getAttributes(?string $className = null): array
     {
diff --git a/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php b/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php
@@ -79,13 +79,11 @@ public function setController(callable $controller, ?array $attributes = null):
     }
 
     /**
-     * @template T of class-string|null
+     * @template T of object
      *
-     * @param T $className
+     * @param class-string<T>|null $className
      *
-     * @return array<class-string, list<object>>|list<object>
-     *
-     * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)
+     * @return ($className is null ? array<class-string, list<object>> : list<T>)
      */
     public function getAttributes(?string $className = null): array
     {

Original file line number	Diff line number	Diff line change
`@@ -97,13 +97,11 @@ public function getNamedArguments(): array`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/**`
`100`		`- * @template T of class-string\|null`
	`100`	`+ * @template T of object`
`101`	`101`	`*`
`102`		`- * @param T $className`
	`102`	`+ * @param class-string<T>\|null $className`
`103`	`103`	`*`
`104`		`- * @return array<class-string, list<object>>\|list<object>`
`105`		`- *`
`106`		`- * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)`
	`104`	`+ * @return ($className is null ? array<class-string, list<object>> : list<T>)`
`107`	`105`	`*/`
`108`	`106`	`public function getAttributes(?string $className = null): array`
`109`	`107`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,11 @@ public function setController(callable $controller, ?array $attributes = null):`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
`82`		`- * @template T of class-string\|null`
	`82`	`+ * @template T of object`
`83`	`83`	`*`
`84`		`- * @param T $className`
	`84`	`+ * @param class-string<T>\|null $className`
`85`	`85`	`*`
`86`		`- * @return array<class-string, list<object>>\|list<object>`
`87`		`- *`
`88`		`- * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)`
	`86`	`+ * @return ($className is null ? array<class-string, list<object>> : list<T>)`
`89`	`87`	`*/`
`90`	`88`	`public function getAttributes(?string $className = null): array`
`91`	`89`	`{`