Set the controller name on the action array when callable array synta…

…x is used
laravel · Jun 5, 2018 · 72842ff · 72842ff
1 parent 17c4c0f
commit 72842ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Illuminate/Routing/RouteAction.php b/src/Illuminate/Routing/RouteAction.php
@@ -31,6 +31,10 @@ public static function parse($uri, $action)
         if (is_callable($action)) {
             if (is_array($action)) {
                 $action = $action[0].'@'.$action[1];
+                return [
+                    'uses' => $action,
+                    'controller' => $action
+                ];
             }
 
             return ['uses' => $action];

diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -1307,6 +1307,8 @@ public function testControllerRoutingArrayCallable()
         $this->assertEquals(0, $_SERVER['route.test.controller.middleware.parameters.one']);
         $this->assertEquals(['foo', 'bar'], $_SERVER['route.test.controller.middleware.parameters.two']);
         $this->assertFalse(isset($_SERVER['route.test.controller.except.middleware']));
+        $action = $router->getRoutes()->getRoutes()[0]->getAction()['controller'];
+        $this->assertEquals('Illuminate\Tests\Routing\RouteTestControllerStub@index', $action);
     }
 
     public function testCallableControllerRouting()