fixing a few things. cleanup

laravel · Jun 22, 2016 · cc60121 · cc60121
1 parent 0f1e407
commit cc60121
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 62 deletions.
diff --git a/src/Illuminate/Foundation/Console/RouteListCommand.php b/src/Illuminate/Foundation/Console/RouteListCommand.php
@@ -157,8 +157,6 @@ protected function getMiddleware($route)
      */
     protected function getControllerMiddleware($actionName)
     {
-        Controller::setRouter($this->laravel['router']);
-
         $segments = explode('@', $actionName);
 
         return $this->getControllerMiddlewareFromInstance(

diff --git a/src/Illuminate/Routing/Controller.php b/src/Illuminate/Routing/Controller.php
@@ -14,13 +14,6 @@ abstract class Controller
      */
     protected $middleware = [];
 
-    /**
-     * The router instance.
-     *
-     * @var \Illuminate\Routing\Router
-     */
-    protected static $router;
-
     /**
      * Register middleware on the controller.
      *
@@ -47,27 +40,6 @@ public function getMiddleware()
         return $this->middleware;
     }
 
-    /**
-     * Get the router instance.
-     *
-     * @return \Illuminate\Routing\Router
-     */
-    public static function getRouter()
-    {
-        return static::$router;
-    }
-
-    /**
-     * Set the router instance.
-     *
-     * @param  \Illuminate\Routing\Router  $router
-     * @return void
-     */
-    public static function setRouter(Router $router)
-    {
-        static::$router = $router;
-    }
-
     /**
      * Execute an action on the controller.
      *

diff --git a/src/Illuminate/Routing/ControllerDispatcher.php b/src/Illuminate/Routing/ControllerDispatcher.php
@@ -6,24 +6,6 @@ class ControllerDispatcher
 {
     use RouteDependencyResolverTrait;
 
-    /**
-     * The router instance.
-     *
-     * @var \Illuminate\Routing\Router
-     */
-    protected $router;
-
-    /**
-     * Create a new controller dispatcher instance.
-     *
-     * @param  \Illuminate\Routing\Router  $router
-     * @return void
-     */
-    public function __construct(Router $router)
-    {
-        $this->router = $router;
-    }
-
     /**
      * Dispatch a request to a given controller and method.
      *
@@ -34,20 +16,18 @@ public function __construct(Router $router)
      */
     public function dispatch(Route $route, $controller, $method)
     {
-        Controller::setRouter($this->router);
-
-        return $this->call($controller, $route, $method);
+        return $this->call($route, $controller, $method);
     }
 
     /**
      * Call the given controller instance method.
      *
-     * @param  \Illuminate\Routing\Controller  $controller
      * @param  \Illuminate\Routing\Route  $route
+     * @param  \Illuminate\Routing\Controller  $controller
      * @param  string  $method
      * @return mixed
      */
-    protected function call($controller, $route, $method)
+    protected function call($route, $controller, $method)
     {
         $parameters = $this->resolveClassMethodDependencies(
             $route->parametersWithoutNulls(), $controller, $method

diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -43,6 +43,13 @@ class Route
      */
     protected $action;
 
+    /**
+     * The controller instance.
+     *
+     * @var mixed
+     */
+    protected $controller;
+
     /**
      * The default values for the route.
      *
@@ -85,13 +92,6 @@ class Route
      */
     protected $router;
 
-    /**
-     * The controller instance.
-     *
-     * @var mixed
-     */
-    protected $controller;
-
     /**
      * The container instance used by the route.
      *
@@ -183,7 +183,7 @@ protected function runCallable()
      */
     protected function runController()
     {
-        return (new ControllerDispatcher($this->router))->dispatch(
+        return (new ControllerDispatcher)->dispatch(
             $this, $this->getController(), $this->getControllerMethod()
         );
     }
@@ -310,7 +310,9 @@ public function controllerMiddleware()
             return [];
         }
 
-        return ControllerDispatcher::getMiddleware($this->getController(), $this->getControllerMethod());
+        return ControllerDispatcher::getMiddleware(
+            $this->getController(), $this->getControllerMethod()
+        );
     }
 
     /**