Merge branch '5.4' into 6.0

* 5.4:
  [Messenger] Fix dealing with unexpected payload in Redis transport
  [Filesystem] Update some PHPDoc of the Path class
  [VarDumper] Fix dumping mysqli_driver instances
  Fix missing ReturnTypeWillChange attributes
  [Cache] Add missing log when saving namespace
  [HttpKernel] Reset services between requests performed by KernelBrowser
  [HttpKernel] Remove unused argument in ArgumentMetadataFactory
  [Stopwatch] Fix test expectation
  [SecurityBundle] fix autoconfiguring Monolog's ProcessorInterface
  KernelTestCase resets internal state on tearDown
  [Security/Http] Fix getting password-upgrader when user-loader is a closure
  [HttpKernel] Fix extracting controller name from closures
  [Intl] fix wrong offset timezone PHP 8.1
  Fix type binding
  Remove duplicated test
  [Dotenv] Fix reading config for symfony/runtime when running dump command
  [Serializer] Remove unnecessary break
  [Runtime] Fix dotenv_overload with commands
  Make document type nodes ignorable
  Initialize Symfony\Component\Security\Core\Exception\AccountStatusException:: property

Author: nicolas-grekas

ControllerMetadata/ArgumentMetadataFactory.php

@@ -27,10 +27,15 @@ public function createArgumentMetadata(string|object|array $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) {
@@ -41,7 +46,7 @@ public function createArgumentMetadata(string|object|array $controller): array
                 }
             }
 
-            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull(), $attributes);
+            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $class), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull(), $attributes);
         }
 
         return $arguments;
@@ -50,20 +55,19 @@ public function createArgumentMetadata(string|object|array $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, ?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;
             }
         }
 

DependencyInjection/RegisterControllerArgumentLocatorsPass.php

@@ -147,12 +147,12 @@ public function process(ContainerBuilder $container)
                             $args[$p->name] = $bindingValue;
                         }
 
+                        continue;
+                    } elseif (!$type || !$autowire || '\\' !== $target[0]) {
                         continue;
                     } elseif (is_subclass_of($type, \UnitEnum::class)) {
                         // do not attempt to register enum typed arguments if not already present in bindings
                         continue;
-                    } elseif (!$type || !$autowire || '\\' !== $target[0]) {
-                        continue;
                     } elseif (!$p->allowsNull()) {
                         $invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;
                     }

Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php

@@ -107,6 +107,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']);