Refactor: check for contextual attribute before getting parameter class name (#53339)

korkoshko · web-flow · commit bdedd4639b15 · 2024-10-30T08:34:07.000-05:00
diff --git a/src/Illuminate/Routing/ResolvesRouteDependencies.php b/src/Illuminate/Routing/ResolvesRouteDependencies.php
@@ -75,12 +75,12 @@ public function resolveMethodDependencies(array $parameters, ReflectionFunctionA
      */
     protected function transformDependency(ReflectionParameter $parameter, $parameters, $skippableValue)
     {
-        $className = Reflector::getParameterClassName($parameter);
-
         if ($attribute = Util::getContextualAttributeFromDependency($parameter)) {
             return $this->container->resolveFromAttribute($attribute);
         }
 
+        $className = Reflector::getParameterClassName($parameter);
+
         // If the parameter has a type-hinted class, we will check to see if it is already in
         // the list of parameters. If it is we will just skip it as it is probably a model
         // binding and we do not want to mess with those; otherwise, we resolve it here.

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ public function resolveMethodDependencies(array $parameters, ReflectionFunctionA`
`75`	`75`	`*/`
`76`	`76`	`protected function transformDependency(ReflectionParameter $parameter, $parameters, $skippableValue)`
`77`	`77`	`{`
`78`		`- $className = Reflector::getParameterClassName($parameter);`
`79`		`-`
`80`	`78`	`if ($attribute = Util::getContextualAttributeFromDependency($parameter)) {`
`81`	`79`	`return $this->container->resolveFromAttribute($attribute);`
`82`	`80`	`}`
`83`	`81`
	`82`	`+ $className = Reflector::getParameterClassName($parameter);`
	`83`	`+`
`84`	`84`	`// If the parameter has a type-hinted class, we will check to see if it is already in`
`85`	`85`	`// the list of parameters. If it is we will just skip it as it is probably a model`
`86`	`86`	`// binding and we do not want to mess with those; otherwise, we resolve it here.`