Revert changes to controller middleware (#40675)

src/Illuminate/Routing/Contracts/ControllerDispatcher.php

@@ -24,12 +24,4 @@ public function dispatch(Route $route, $controller, $method);
      * @return array
      */
     public function getMiddleware($controller, $method);
-
-    /**
-     * Determine if the dispatcher should attempt to gather middleware from a controller.
-     *
-     * @param  string  $controller
-     * @return bool
-     */
-    public function shouldGatherMiddleware($controller);
 }

src/Illuminate/Routing/ControllerDispatcher.php

@@ -57,22 +57,15 @@ public function dispatch(Route $route, $controller, $method)
      */
     public function getMiddleware($controller, $method)
     {
+        if (! method_exists($controller, 'getMiddleware')) {
+            return [];
+        }
+
         return collect($controller->getMiddleware())->reject(function ($data) use ($method) {
             return static::methodExcludedByOptions($method, $data['options']);
         })->pluck('middleware')->all();
     }
 
-    /**
-     * Determine if the dispatcher should attempt to gather middleware from a controller.
-     *
-     * @param  string  $controller
-     * @return bool
-     */
-    public function shouldGatherMiddleware($controller)
-    {
-        return method_exists($controller, 'getMiddleware');
-    }
-
     /**
      * Determine if the given options exclude a particular method.
      *

src/Illuminate/Routing/Route.php

@@ -58,13 +58,6 @@ class Route
      */
     public $controller;
 
-    /**
-     * The controller instance class name.
-     *
-     * @var string
-     */
-    public $controllerClass;
-
     /**
      * The default values for the route.
      *
@@ -277,24 +270,12 @@ protected function runController()
     public function getController()
     {
         if (! $this->controller) {
-            $this->controller = $this->container->make($this->getControllerClass());
-        }
-
-        return $this->controller;
-    }
+            $class = $this->parseControllerCallback()[0];
 
-    /**
-     * Get the controller class reference for the route.
-     *
-     * @return string
-     */
-    public function getControllerClass()
-    {
-        if (! $this->controllerClass) {
-            $this->controllerClass = ltrim($this->parseControllerCallback()[0], '\\');
+            $this->controller = $this->container->make(ltrim($class, '\\'));
         }
 
-        return $this->controllerClass;
+        return $this->controller;
     }
 
     /**
@@ -1086,10 +1067,6 @@ public function controllerMiddleware()
             return [];
         }
 
-        if (! $this->controllerDispatcher()->shouldGatherMiddleware($this->getControllerClass())) {
-            return [];
-        }
-
         return $this->controllerDispatcher()->getMiddleware(
             $this->getController(), $this->getControllerMethod()
         );