diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
index 05a68229a331a..6141b53edd267 100644
--- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -27,14 +27,19 @@ public function createArgumentMetadata($controller): array
if (\is_array($controller)) {
$reflection = new \ReflectionMethod($controller[0], $controller[1]);
+ $class = $reflection->class;
} elseif (\is_object($controller) && !$controller instanceof \Closure) {
- $reflection = (new \ReflectionObject($controller))->getMethod('__invoke');
+ $reflection = new \ReflectionMethod($controller, '__invoke');
+ $class = $reflection->class;
} else {
$reflection = new \ReflectionFunction($controller);
+ if ($class = str_contains($reflection->name, '{closure}') ? null : $reflection->getClosureScopeClass()) {
+ $class = $class->name;
+ }
}
foreach ($reflection->getParameters() as $param) {
- $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
+ $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection, $class), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
}
return $arguments;
@@ -43,20 +48,19 @@ public function createArgumentMetadata($controller): array
/**
* Returns an associated type to the given parameter if available.
*/
- private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function): ?string
+ private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function, ?string $class): ?string
{
if (!$type = $parameter->getType()) {
return null;
}
$name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
- if ($function instanceof \ReflectionMethod) {
- $lcName = strtolower($name);
- switch ($lcName) {
+ if (null !== $class) {
+ switch (strtolower($name)) {
case 'self':
- return $function->getDeclaringClass()->name;
+ return $class;
case 'parent':
- return ($parent = $function->getDeclaringClass()->getParentClass()) ? $parent->name : null;
+ return get_parent_class($class) ?: null;
}
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
index dfab909802f80..cbef2d3cf2ec1 100644
--- a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -105,6 +105,17 @@ public function testBasicTypesSignature()
], $arguments);
}
+ public function testNamedClosure()
+ {
+ $arguments = $this->factory->createArgumentMetadata(\Closure::fromCallable([$this, 'signature1']));
+
+ $this->assertEquals([
+ new ArgumentMetadata('foo', self::class, false, false, null),
+ new ArgumentMetadata('bar', 'array', false, false, null),
+ new ArgumentMetadata('baz', 'callable', false, false, null),
+ ], $arguments);
+ }
+
public function testNullableTypesSignature()
{
$arguments = $this->factory->createArgumentMetadata([new NullableController(), 'action']);
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy