[5.4] Allow non-method Callables (#19168)

* Allow non-method Callables * Add callable controller test case
laravel · May 12, 2017 · 0cf1f76 · 0cf1f76
1 parent 13cfd83
commit 0cf1f76
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Illuminate/Routing/RouteSignatureParameters.php b/src/Illuminate/Routing/RouteSignatureParameters.php
@@ -36,6 +36,10 @@ protected static function fromClassMethodString($uses)
     {
         list($class, $method) = Str::parseCallback($uses);
 
+        if (! method_exists($class, $method) && is_callable($class, $method)) {
+            return [];
+        }
+
         return (new ReflectionMethod($class, $method))->getParameters();
     }
 }
diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php
@@ -1205,6 +1205,17 @@ public function testControllerRouting()
         $this->assertFalse(isset($_SERVER['route.test.controller.except.middleware']));
     }
 
+    public function testCallableControllerRouting()
+    {
+        $router = $this->getRouter();
+
+        $router->get('foo/bar', 'Illuminate\Tests\Routing\RouteTestControllerCallableStub@bar');
+        $router->get('foo/baz', 'Illuminate\Tests\Routing\RouteTestControllerCallableStub@baz');
+
+        $this->assertEquals('bar', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());
+        $this->assertEquals('baz', $router->dispatch(Request::create('foo/baz', 'GET'))->getContent());
+    }
+
     public function testControllerMiddlewareGroups()
     {
         unset(
@@ -1326,6 +1337,14 @@ public function index()
     }
 }
 
+class RouteTestControllerCallableStub extends Controller
+{
+    public function __call($method, $arguments = [])
+    {
+        return $method;
+    }
+}
+
 class RouteTestControllerMiddlewareGroupStub extends Controller
 {
     public function __construct()