Router optionally takes a DispatcherInterface on construction

src/Dispatching/DispatchProviderInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace WellRESTed\Dispatching;
-
-interface DispatchProviderInterface
-{
-    /**
-     * @return DispatcherInterface
-     */
-    public function getDispatcher();
-
-    /**
-     * Return a DispatchStackInterface for a list array of middleware.
-     *
-     * @param mixed[] $middlewares
-     * @return DispatchStackInterface
-     */
-    public function getDispatchStack($middlewares);
-}

src/Routing/Router.php

@@ -4,15 +4,16 @@ namespace WellRESTed\Routing;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use WellRESTed\Dispatching\DispatchProviderInterface;
+use WellRESTed\Dispatching\Dispatcher;
+use WellRESTed\Dispatching\DispatcherInterface;
 use WellRESTed\Routing\Route\RouteFactory;
 use WellRESTed\Routing\Route\RouteFactoryInterface;
 use WellRESTed\Routing\Route\RouteInterface;
 
 class Router implements RouterInterface
 {
-    /** @var DispatchProviderInterface */
-    private $dispatchProvider;
+    /** @var DispatcherInterface */
+    private $dispatcher;
     /** @var RouteFactoryInterface */
     private $factory;
     /** @var RouteInterface[] Array of Route objects */
@@ -24,10 +25,13 @@ class Router implements RouterInterface
     /** @var RouteInterface[] Hash array mapping path prefixes to routes */
     private $patternRoutes;
 
-    public function __construct(DispatchProviderInterface $dispatchProvider)
+    public function __construct(DispatcherInterface $dispatcher = null)
     {
-        $this->dispatchProvider = $dispatchProvider;
-        $this->factory = $this->getRouteFactory($this->dispatchProvider->getDispatcher());
+        if ($dispatcher === null) {
+            $dispatcher = new Dispatcher();
+        }
+        $this->dispatcher = $dispatcher;
+        $this->factory = $this->getRouteFactory($this->dispatcher);
         $this->routes = [];
         $this->staticRoutes = [];
         $this->prefixRoutes = [];
@@ -65,9 +69,6 @@ class Router implements RouterInterface
     public function register($method, $target, $middleware)
     {
         $route = $this->getRouteForTarget($target);
-        if (is_array($middleware)) {
-            $middleware = $this->dispatchProvider->getDispatchStack($middleware);
-        }
         $route->getMethodMap()->register($method, $middleware);
         return $this;
     }

test/tests/unit/Routing/RouterTest.php

@@ -6,8 +6,6 @@ use Prophecy\Argument;
 use WellRESTed\Routing\Route\RouteInterface;
 use WellRESTed\Routing\Router;
 
-// TODO: register with array of middleware creates stack
-
 /**
  * @coversDefaultClass WellRESTed\Routing\Router
  * @uses WellRESTed\Routing\Router
@@ -16,7 +14,6 @@ use WellRESTed\Routing\Router;
 class RouterTest extends \PHPUnit_Framework_TestCase
 {
     private $dispatcher;
-    private $dispatchProvider;
     private $methodMap;
     private $factory;
     private $request;
@@ -55,9 +52,6 @@ class RouterTest extends \PHPUnit_Framework_TestCase
             }
         );
 
-        $this->dispatchProvider = $this->prophesize('WellRESTed\Dispatching\DispatchProviderInterface');
-        $this->dispatchProvider->getDispatcher()->willReturn($this->dispatcher->reveal());
-
         $this->router = $this->getMockBuilder('WellRESTed\Routing\Router')
             ->setMethods(["getRouteFactory"])
             ->disableOriginalConstructor()
@@ -65,7 +59,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
         $this->router->expects($this->any())
             ->method("getRouteFactory")
             ->will($this->returnValue($this->factory->reveal()));
-        $this->router->__construct($this->dispatchProvider->reveal());
+        $this->router->__construct($this->dispatcher->reveal());
     }
 
     // ------------------------------------------------------------------------
@@ -78,7 +72,19 @@ class RouterTest extends \PHPUnit_Framework_TestCase
      */
     public function testCreatesInstance()
     {
-        $routeMap = new Router($this->dispatchProvider->reveal());
+        $routeMap = new Router($this->dispatcher->reveal());
+        $this->assertNotNull($routeMap);
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::getRouteFactory
+     * @uses WellRESTed\Routing\Route\RouteFactory
+     * @uses WellRESTed\Dispatching\Dispatcher
+     */
+    public function testCreatesInstanceWithDispatcherByDefault()
+    {
+        $routeMap = new Router();
         $this->assertNotNull($routeMap);
     }
 
@@ -116,18 +122,6 @@ class RouterTest extends \PHPUnit_Framework_TestCase
         $this->methodMap->register("GET", "middleware")->shouldHaveBeenCalled();
     }
 
-    /**
-     * @covers ::register
-     */
-    public function testCreatesDispatchStackForMiddlewareArray()
-    {
-        $stack = $this->prophesize('WellRESTed\MiddlewareInterface');
-        $this->dispatchProvider->getDispatchStack(Argument::any())->willReturn($stack->reveal());
-
-        $this->router->register("GET", "/", ["middleware1", "middleware2"]);
-        $this->methodMap->register("GET", $stack->reveal())->shouldHaveBeenCalled();
-    }
-
     // ------------------------------------------------------------------------
     // Dispatching