[12.x] Pass ReflectionParameter to attribute resolving

src/Illuminate/Container/Attributes/RouteParameter.php

@@ -5,14 +5,15 @@
 use Attribute;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Container\ContextualAttribute;
+use ReflectionParameter;
 
 #[Attribute(Attribute::TARGET_PARAMETER)]
 class RouteParameter implements ContextualAttribute
 {
     /**
      * Create a new class instance.
      */
-    public function __construct(public string $parameter)
+    public function __construct(public ?string $parameter = null)
     {
     }
 
@@ -21,10 +22,11 @@ public function __construct(public string $parameter)
      *
      * @param  self  $attribute
      * @param  \Illuminate\Contracts\Container\Container  $container
+     * @param  \ReflectionParameter  $parameter
      * @return mixed
      */
-    public static function resolve(self $attribute, Container $container)
+    public static function resolve(self $attribute, Container $container, ReflectionParameter $parameter)
     {
-        return $container->make('request')->route($attribute->parameter);
+        return $container->make('request')->route($attribute->parameter ?? $parameter->getName());
     }
 }

src/Illuminate/Container/BoundMethod.php

@@ -175,7 +175,7 @@ protected static function addDependencyForCallParameter(
 
             unset($parameters[$paramName]);
         } elseif ($attribute = Util::getContextualAttributeFromDependency($parameter)) {
-            $pendingDependencies[] = $container->resolveFromAttribute($attribute);
+            $pendingDependencies[] = $container->resolveFromAttribute($attribute, $parameter);
         } elseif (! is_null($className = Util::getParameterClassName($parameter))) {
             if (array_key_exists($className, $parameters)) {
                 $pendingDependencies[] = $parameters[$className];

src/Illuminate/Container/Container.php

@@ -1267,7 +1267,7 @@ protected function resolveDependencies(array $dependencies)
             $result = null;
 
             if (! is_null($attribute = Util::getContextualAttributeFromDependency($dependency))) {
-                $result = $this->resolveFromAttribute($attribute);
+                $result = $this->resolveFromAttribute($attribute, $dependency);
             }
 
             // If the class is null, it means the dependency is a string or some other
@@ -1416,9 +1416,10 @@ protected function resolveVariadicClass(ReflectionParameter $parameter)
      * Resolve a dependency based on an attribute.
      *
      * @param  \ReflectionAttribute  $attribute
+     * @param  \ReflectionParameter  $parameter
      * @return mixed
      */
-    public function resolveFromAttribute(ReflectionAttribute $attribute)
+    public function resolveFromAttribute(ReflectionAttribute $attribute, ReflectionParameter $parameter)
     {
         $handler = $this->contextualAttributes[$attribute->getName()] ?? null;
 
@@ -1432,7 +1433,7 @@ public function resolveFromAttribute(ReflectionAttribute $attribute)
             throw new BindingResolutionException("Contextual binding attribute [{$attribute->getName()}] has no registered handler.");
         }
 
-        return $handler($instance, $this);
+        return $handler($instance, $this, $parameter);
     }
 
     /**

src/Illuminate/Routing/ResolvesRouteDependencies.php

@@ -76,7 +76,7 @@ public function resolveMethodDependencies(array $parameters, ReflectionFunctionA
     protected function transformDependency(ReflectionParameter $parameter, $parameters, $skippableValue)
     {
         if ($attribute = Util::getContextualAttributeFromDependency($parameter)) {
-            return $this->container->resolveFromAttribute($attribute);
+            return $this->container->resolveFromAttribute($attribute, $parameter);
         }
 
         $className = Reflector::getParameterClassName($parameter);