[10.x] Refactor shared static methodExcludedByOptions method to trait

src/Illuminate/Routing/CallableDispatcher.php

@@ -8,7 +8,7 @@
 
 class CallableDispatcher implements CallableDispatcherContract
 {
-    use RouteDependencyResolverTrait;
+    use ResolvesRouteDependencies;
 
     /**
      * The container instance.

src/Illuminate/Routing/ControllerDispatcher.php

@@ -7,7 +7,7 @@
 
 class ControllerDispatcher implements ControllerDispatcherContract
 {
-    use RouteDependencyResolverTrait;
+    use FiltersControllerMiddleware, ResolvesRouteDependencies;
 
     /**
      * The container instance.
@@ -78,17 +78,4 @@ public function getMiddleware($controller, $method)
             return static::methodExcludedByOptions($method, $data['options']);
         })->pluck('middleware')->all();
     }
-
-    /**
-     * Determine if the given options exclude a particular method.
-     *
-     * @param  string  $method
-     * @param  array  $options
-     * @return bool
-     */
-    public static function methodExcludedByOptions($method, array $options)
-    {
-        return (isset($options['only']) && ! in_array($method, (array) $options['only'])) ||
-            (! empty($options['except']) && in_array($method, (array) $options['except']));
-    }
 }

src/Illuminate/Routing/FiltersControllerMiddleware.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Illuminate\Routing;
+
+trait FiltersControllerMiddleware
+{
+    /**
+     * Determine if the given options exclude a particular method.
+     *
+     * @param  string  $method
+     * @param  array  $options
+     * @return bool
+     */
+    public static function methodExcludedByOptions($method, array $options)
+    {
+        return (isset($options['only']) && ! in_array($method, (array) $options['only'])) ||
+               (! empty($options['except']) && in_array($method, (array) $options['except']));
+    }
+}

src/Illuminate/Routing/ResolvesRouteDependencies.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace Illuminate\Routing;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Reflector;
+use ReflectionClass;
+use ReflectionFunctionAbstract;
+use ReflectionMethod;
+use ReflectionParameter;
+use stdClass;
+
+trait ResolvesRouteDependencies
+{
+    /**
+     * Resolve the object method's type-hinted dependencies.
+     *
+     * @param  array  $parameters
+     * @param  object  $instance
+     * @param  string  $method
+     * @return array
+     */
+    protected function resolveClassMethodDependencies(array $parameters, $instance, $method)
+    {
+        if (! method_exists($instance, $method)) {
+            return $parameters;
+        }
+
+        return $this->resolveMethodDependencies(
+            $parameters, new ReflectionMethod($instance, $method)
+        );
+    }
+
+    /**
+     * Resolve the given method's type-hinted dependencies.
+     *
+     * @param  array  $parameters
+     * @param  \ReflectionFunctionAbstract  $reflector
+     * @return array
+     */
+    public function resolveMethodDependencies(array $parameters, ReflectionFunctionAbstract $reflector)
+    {
+        $instanceCount = 0;
+
+        $values = array_values($parameters);
+
+        $skippableValue = new stdClass;
+
+        foreach ($reflector->getParameters() as $key => $parameter) {
+            $instance = $this->transformDependency($parameter, $parameters, $skippableValue);
+
+            if ($instance !== $skippableValue) {
+                $instanceCount++;
+
+                $this->spliceIntoParameters($parameters, $key, $instance);
+            } elseif (! isset($values[$key - $instanceCount]) &&
+                      $parameter->isDefaultValueAvailable()) {
+                $this->spliceIntoParameters($parameters, $key, $parameter->getDefaultValue());
+            }
+        }
+
+        return $parameters;
+    }
+
+    /**
+     * Attempt to transform the given parameter into a class instance.
+     *
+     * @param  \ReflectionParameter  $parameter
+     * @param  array  $parameters
+     * @param  object  $skippableValue
+     * @return mixed
+     */
+    protected function transformDependency(ReflectionParameter $parameter, $parameters, $skippableValue)
+    {
+        $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.
+        if ($className && ! $this->alreadyInParameters($className, $parameters)) {
+            $isEnum = (new ReflectionClass($className))->isEnum();
+
+            return $parameter->isDefaultValueAvailable()
+                ? ($isEnum ? $parameter->getDefaultValue() : null)
+                : $this->container->make($className);
+        }
+
+        return $skippableValue;
+    }
+
+    /**
+     * Determine if an object of the given class is in a list of parameters.
+     *
+     * @param  string  $class
+     * @param  array  $parameters
+     * @return bool
+     */
+    protected function alreadyInParameters($class, array $parameters)
+    {
+        return ! is_null(Arr::first($parameters, fn ($value) => $value instanceof $class));
+    }
+
+    /**
+     * Splice the given value into the parameter list.
+     *
+     * @param  array  $parameters
+     * @param  string  $offset
+     * @param  mixed  $value
+     * @return void
+     */
+    protected function spliceIntoParameters(array &$parameters, $offset, $value)
+    {
+        array_splice(
+            $parameters, $offset, 0, [$value]
+        );
+    }
+}

src/Illuminate/Routing/Route.php

@@ -22,7 +22,7 @@
 
 class Route
 {
-    use CreatesRegularExpressionRouteConstraints, Macroable, RouteDependencyResolverTrait;
+    use CreatesRegularExpressionRouteConstraints, FiltersControllerMiddleware, Macroable, ResolvesRouteDependencies;
 
     /**
      * The URI pattern the route responds to.
@@ -1114,7 +1114,7 @@ public function controllerMiddleware()
     protected function staticallyProvidedControllerMiddleware(string $class, string $method)
     {
         return collect($class::middleware())->reject(function ($middleware) use ($method) {
-            return $this->controllerDispatcher()::methodExcludedByOptions(
+            return static::methodExcludedByOptions(
                 $method, ['only' => $middleware->only, 'except' => $middleware->except]
             );
         })->map->middleware->values()->all();

src/Illuminate/Routing/RouteDependencyResolverTrait.php

@@ -2,116 +2,10 @@
 
 namespace Illuminate\Routing;
 
-use Illuminate\Support\Arr;
-use Illuminate\Support\Reflector;
-use ReflectionClass;
-use ReflectionFunctionAbstract;
-use ReflectionMethod;
-use ReflectionParameter;
-use stdClass;
-
+/**
+ * @deprecated
+ */
 trait RouteDependencyResolverTrait
 {
-    /**
-     * Resolve the object method's type-hinted dependencies.
-     *
-     * @param  array  $parameters
-     * @param  object  $instance
-     * @param  string  $method
-     * @return array
-     */
-    protected function resolveClassMethodDependencies(array $parameters, $instance, $method)
-    {
-        if (! method_exists($instance, $method)) {
-            return $parameters;
-        }
-
-        return $this->resolveMethodDependencies(
-            $parameters, new ReflectionMethod($instance, $method)
-        );
-    }
-
-    /**
-     * Resolve the given method's type-hinted dependencies.
-     *
-     * @param  array  $parameters
-     * @param  \ReflectionFunctionAbstract  $reflector
-     * @return array
-     */
-    public function resolveMethodDependencies(array $parameters, ReflectionFunctionAbstract $reflector)
-    {
-        $instanceCount = 0;
-
-        $values = array_values($parameters);
-
-        $skippableValue = new stdClass;
-
-        foreach ($reflector->getParameters() as $key => $parameter) {
-            $instance = $this->transformDependency($parameter, $parameters, $skippableValue);
-
-            if ($instance !== $skippableValue) {
-                $instanceCount++;
-
-                $this->spliceIntoParameters($parameters, $key, $instance);
-            } elseif (! isset($values[$key - $instanceCount]) &&
-                      $parameter->isDefaultValueAvailable()) {
-                $this->spliceIntoParameters($parameters, $key, $parameter->getDefaultValue());
-            }
-        }
-
-        return $parameters;
-    }
-
-    /**
-     * Attempt to transform the given parameter into a class instance.
-     *
-     * @param  \ReflectionParameter  $parameter
-     * @param  array  $parameters
-     * @param  object  $skippableValue
-     * @return mixed
-     */
-    protected function transformDependency(ReflectionParameter $parameter, $parameters, $skippableValue)
-    {
-        $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.
-        if ($className && ! $this->alreadyInParameters($className, $parameters)) {
-            $isEnum = (new ReflectionClass($className))->isEnum();
-
-            return $parameter->isDefaultValueAvailable()
-                ? ($isEnum ? $parameter->getDefaultValue() : null)
-                : $this->container->make($className);
-        }
-
-        return $skippableValue;
-    }
-
-    /**
-     * Determine if an object of the given class is in a list of parameters.
-     *
-     * @param  string  $class
-     * @param  array  $parameters
-     * @return bool
-     */
-    protected function alreadyInParameters($class, array $parameters)
-    {
-        return ! is_null(Arr::first($parameters, fn ($value) => $value instanceof $class));
-    }
-
-    /**
-     * Splice the given value into the parameter list.
-     *
-     * @param  array  $parameters
-     * @param  string  $offset
-     * @param  mixed  $value
-     * @return void
-     */
-    protected function spliceIntoParameters(array &$parameters, $offset, $value)
-    {
-        array_splice(
-            $parameters, $offset, 0, [$value]
-        );
-    }
+    use ResolvesRouteDependencies;
 }

tests/Routing/ImplicitRouteBindingTest.php

@@ -9,7 +9,7 @@
 use Illuminate\Routing\Route;
 use PHPUnit\Framework\TestCase;
 
-include 'Enums.php';
+include_once 'Enums.php';
 
 class ImplicitRouteBindingTest extends TestCase
 {

tests/Routing/RoutingRouteTest.php

@@ -1895,7 +1895,7 @@ public function testImplicitBindingsWithOptionalParameterWithNoKeyInUri()
 
     public function testImplicitBindingsWithOptionalParameterUsingEnumIsAlwaysCastedToEnum()
     {
-        include_once 'enums.php';
+        include_once 'Enums.php';
 
         $router = $this->getRouter();
         $router->get('foo/{bar?}', [