[5.5] Add extension point for custom ControllerDispatcher

src/Illuminate/Routing/Contracts/ControllerDispatcher.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Illuminate\Routing\Contracts;
+
+use Illuminate\Routing\Route;
+
+interface ControllerDispatcher
+{
+    /**
+     * Dispatch a request to a given controller and method.
+     *
+     * @param  Route  $route
+     * @param  mixed  $controller
+     * @param  string  $method
+     * @return mixed
+     */
+    public function dispatch(Route $route, $controller, $method);
+
+    /**
+     * Get the middleware for the controller instance.
+     *
+     * @param  \Illuminate\Routing\Controller  $controller
+     * @param  string  $method
+     * @return array
+     */
+    public function getMiddleware($controller, $method);
+}

src/Illuminate/Routing/ControllerDispatcher.php

@@ -3,8 +3,9 @@
 namespace Illuminate\Routing;
 
 use Illuminate\Container\Container;
+use Illuminate\Routing\Contracts\ControllerDispatcher as ControllerDispatcherContract;
 
-class ControllerDispatcher
+class ControllerDispatcher implements ControllerDispatcherContract
 {
     use RouteDependencyResolverTrait;
 
@@ -54,7 +55,7 @@ public function dispatch(Route $route, $controller, $method)
      * @param  string  $method
      * @return array
      */
-    public static function getMiddleware($controller, $method)
+    public function getMiddleware($controller, $method)
     {
         if (! method_exists($controller, 'getMiddleware')) {
             return [];

src/Illuminate/Routing/Route.php

@@ -14,6 +14,7 @@
 use Illuminate\Routing\Matching\MethodValidator;
 use Illuminate\Routing\Matching\SchemeValidator;
 use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Routing\Contracts\ControllerDispatcher as ControllerDispatcherContract;
 
 class Route
 {
@@ -199,7 +200,7 @@ protected function runCallable()
      */
     protected function runController()
     {
-        return (new ControllerDispatcher($this->container))->dispatch(
+        return $this->controllerDispatcher()->dispatch(
             $this, $this->getController(), $this->getControllerMethod()
         );
     }
@@ -743,11 +744,25 @@ public function controllerMiddleware()
             return [];
         }
 
-        return ControllerDispatcher::getMiddleware(
+        return $this->controllerDispatcher()->getMiddleware(
             $this->getController(), $this->getControllerMethod()
         );
     }
 
+    /**
+     * Get the dispatcher for the route's controller.
+     *
+     * @return ControllerDispatcherContract
+     */
+    public function controllerDispatcher()
+    {
+        if ($this->container->bound(ControllerDispatcherContract::class)) {
+            return $this->container->make(ControllerDispatcherContract::class);
+        }
+
+        return new ControllerDispatcher($this->container);
+    }
+
     /**
      * Get the route validators for the instance.
      *

src/Illuminate/Routing/RoutingServiceProvider.php

@@ -9,6 +9,7 @@
 use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 use Illuminate\Contracts\View\Factory as ViewFactoryContract;
 use Illuminate\Contracts\Routing\ResponseFactory as ResponseFactoryContract;
+use Illuminate\Routing\Contracts\ControllerDispatcher as ControllerDispatcherContract;
 
 class RoutingServiceProvider extends ServiceProvider
 {
@@ -30,6 +31,8 @@ public function register()
         $this->registerPsrResponse();
 
         $this->registerResponseFactory();
+
+        $this->registerControllerDispatcher();
     }
 
     /**
@@ -148,4 +151,16 @@ protected function registerResponseFactory()
             return new ResponseFactory($app[ViewFactoryContract::class], $app['redirect']);
         });
     }
+
+    /**
+     * Register the controller dispatcher.
+     *
+     * @return void
+     */
+    protected function registerControllerDispatcher()
+    {
+        $this->app->singleton(ControllerDispatcherContract::class, function ($app) {
+            return new ControllerDispatcher($app);
+        });
+    }
 }