Merge branch '6.3' into 6.4

* 6.3:
  [DependencyInjection][HttpKernel] Fix using `#[AutowireCallable]` with controller arguments

Author: nicolas-grekas

Attribute/AutowireCallable.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Attribute;
 
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -38,4 +39,12 @@ public function __construct(
 
         parent::__construct($callable ?? [new Reference($service), $method ?? '__invoke'], lazy: $lazy);
     }
+
+    public function buildDefinition(mixed $value, ?string $type, \ReflectionParameter $parameter): Definition
+    {
+        return (new Definition($type = \is_string($this->lazy) ? $this->lazy : ($type ?: 'Closure')))
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setArguments([\is_array($value) ? $value + [1 => '__invoke'] : $value])
+            ->setLazy($this->lazy || 'Closure' !== $type && 'callable' !== (string) $parameter->getType());
+    }
 }

Compiler/AutowirePass.php

@@ -316,10 +316,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                     }
 
                     if ($attribute instanceof AutowireCallable) {
-                        $value = (new Definition($type = \is_string($attribute->lazy) ? $attribute->lazy : ($type ?: 'Closure')))
-                            ->setFactory(['Closure', 'fromCallable'])
-                            ->setArguments([\is_array($value) ? $value + [1 => '__invoke'] : $value])
-                            ->setLazy($attribute->lazy || 'Closure' !== $type && 'callable' !== (string) $parameter->getType());
+                        $value = $attribute->buildDefinition($value, $type, $parameter);
                     } elseif ($lazy = $attribute->lazy) {
                         $definition = (new Definition($type))
                             ->setFactory('current')