Merge pull request #5 from dicoding-dev/feature/invokable-controller

Implements single action controller

Author: rizqyhi

src/Illuminate/Routing/Router.php

@@ -992,9 +992,13 @@ protected function getClassClosure($controller)
 			// Now we can split the controller and method out of the action string so that we
 			// can call them appropriately on the class. This controller and method are in
 			// in the Class@method format and we need to explode them out then use them.
-			[$class, $method] = explode('@', $controller);
+            $controller = explode('@', $controller);
+            $class = $controller[0];
 
-			return $d->dispatch($route, $request, $class, $method);
+            // if route action doesn't define method, then by default use `__invoke` method, thus invokable action
+            $method = $controller[1] ?? '__invoke';
+
+            return $d->dispatch($route, $request, $class, $method);
 		};
 	}
 

tests/Routing/RoutingRouteTest.php

@@ -898,6 +898,21 @@ public function testRouteRedirect()
     }
 
 
+    public function testDispatchingCallableActionClasses()
+    {
+        $router = $this->getRouter();
+        $router->get('foo/bar', 'ActionStub');
+
+        $this->assertEquals('hello', $router->dispatch(Request::create('foo/bar', 'GET'))->getContent());
+
+        $router->get('foo/bar2', [
+            'uses' => 'ActionStub',
+        ]);
+
+        $this->assertEquals('hello', $router->dispatch(Request::create('foo/bar2', 'GET'))->getContent());
+    }
+
+
 	protected function getRouter(): Router
     {
 		return new Router(new Illuminate\Events\Dispatcher);
@@ -994,3 +1009,11 @@ public function handle(): string
 		return 'handling!';
 	}
 }
+
+class ActionStub extends Controller
+{
+    public function __invoke(): string
+    {
+        return 'hello';
+    }
+}