Merge pull request #73 from pennyphp/feature/dispatch-callable

Dispatcher must be a callable
pennyphp · Oct 2, 2015 · fcecbdf · fcecbdf
2 parents 5d06703 + 48667b5
commit fcecbdf
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 12 deletions.
diff --git a/src/App.php b/src/App.php
@@ -67,8 +67,8 @@ public static function buildContainer($config = [])
         $builder = new DI\ContainerBuilder();
         $builder->useAnnotations(true);
         $builder->addDefinitions([
-            "event_manager" =>  DI\object('Zend\EventManager\EventManager'),
-            "dispatcher" => DI\object('GianArb\Penny\Dispatcher')
+            'event_manager' => DI\object('Zend\EventManager\EventManager'),
+            'dispatcher' => DI\object('GianArb\Penny\Dispatcher')
                 ->constructor(DI\get('router')),
         ]);
         $builder->addDefinitions($config);
@@ -94,6 +94,9 @@ public function getContainer()
     private function getDispatcher()
     {
         $container = $this->container;
+        if (!is_callable($container->get('dispatcher'))) {
+            throw new \RuntimeException('Dispatcher must be a callable');
+        }
 
         return $container->get('dispatcher');
     }
@@ -113,14 +116,14 @@ private function getEventManager()
     /**
      * Application execution.
      *
-     * @param mixed|null  $request  Representation of an outgoing, client-side request.
+     * @param mixed|null $request  Representation of an outgoing, client-side request.
      * @param mixed|null $response Representation of an outgoing, server-side response.
      *
      * @return mixed
      */
     public function run($request = null, $response = null)
     {
-        $request  = $request ?: ServerRequestFactory::fromGlobals();
+        $request = $request ?: ServerRequestFactory::fromGlobals();
         $response = $response ?: new Response();
 
         $event = new HttpFlowEvent('bootstrap', $request, $response);
@@ -130,7 +133,7 @@ public function run($request = null, $response = null)
         $httpFlow = $this->getEventManager();
 
         try {
-            $routerInfo = $dispatcher->dispatch($request);
+            $routerInfo = call_user_func($dispatcher, $request);
         } catch (Exception $exception) {
             $event->setName('ERROR_DISPATCH');
             $event->setException($exception);

diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -31,15 +31,16 @@ public function __construct(FastRouterDispatcherInterface $router)
     /**
      * Dispatching.
      *
-     * @param RequestInterface $request Representation of an outgoing, client-side request.
+     * @param RequestInterface $request Representation of an outgoing,
+     *                                  client-side request.
      *
      * @throws RouteNotFound    If the route is not found.
      * @throws MethodNotAllowed If the method is not allowed.
      * @throws Exception        If no one case is matched.
      *
      * @return array
      */
-    public function dispatch(RequestInterface $request)
+    public function __invoke(RequestInterface $request)
     {
         $router = $this->router;
         $uri = $request->getUri();

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -161,4 +161,24 @@ public function testMethodNotAllowed()
         $response = $this->app->run($request, $response);
         $this->assertEquals(405, $response->getStatusCode());
     }
+
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testDispatcherShouldBeCallable()
+    {
+        $request = (new Request())
+        ->withUri(new Uri('/'))
+        ->withMethod('POST');
+        $response = new Response();
+
+        $config = Loader::load();
+        $config['router'] = FastRoute\simpleDispatcher(function (FastRoute\RouteCollector $r) {
+            $r->addRoute('GET', '/', ['TestApp\Controller\Index', 'index']);
+        });
+        $config['dispatcher'] = new \StdClass();
+
+        $app = new App(App::buildContainer($config));
+        $app->run($request, $response);
+    }
 }
diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
@@ -41,7 +41,7 @@ public function testDispatchRouteNotFoundRequest()
         ->withMethod('GET');
 
         $dispatcher = new Dispatcher($this->router);
-        $dispatcher->dispatch($request);
+        $dispatcher($request);
     }
 
     public function testDispatchMethodNotAllowedRequest()
@@ -52,7 +52,7 @@ public function testDispatchMethodNotAllowedRequest()
         ->withMethod('POST');
 
         $dispatcher = new Dispatcher($this->router);
-        $dispatcher->dispatch($request);
+        $dispatcher($request);
     }
 
     public function testDispatchGot500Exception()
@@ -69,6 +69,6 @@ public function testDispatchGot500Exception()
         ])->shouldBeCalled();
 
         $dispatcher = new Dispatcher($router->reveal());
-        $dispatcher->dispatch($request);
+        $dispatcher($request);
     }
 }
diff --git a/tests/Utils/FastSymfonyDispatcher.php b/tests/Utils/FastSymfonyDispatcher.php
@@ -13,9 +13,10 @@ public function __construct($router)
         $this->router = $router;
     }
 
-    public function dispatch(Request $request)
+    public function __invoke(Request $request)
     {
-        $routeInfo = $this->router->dispatch($request->getMethod(), $request->getPathInfo());
+        $routeInfo = $this->router
+            ->dispatch($request->getMethod(), $request->getPathInfo());
         switch ($routeInfo[0]) {
             case \FastRoute\Dispatcher::NOT_FOUND:
                 throw new \GianArb\Penny\Exception\RouteNotFound();