Updated to use zend-router v3

This patch updates the component to use zend-router 3.0, allowing the
removal of the entire `Zend\Mvc\Router` namespace, as well as related
factories in the `Zend\Mvc\Service` namespace.

Tests were updated to reflect the change. One set of tests, for the url
controller plugin, were marked skipped, as they rely on zend-view being
updated to use zend-router.

TODO
----

- [ ] once zend-view is updated, update the dependencies in this patch.
- [ ] experiment with having tests use zend-router as a module/config
  provider, to see if they can pass.

Author: weierophinney

composer.json

@@ -18,6 +18,7 @@
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-hydrator": "^1.1 || ^2.1",
         "zendframework/zend-form": "^2.7",
+        "zendframework/zend-router": "^3.0",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
         "zendframework/zend-psr7bridge": "^0.2",
         "container-interop/container-interop": "^1.1"
@@ -37,7 +38,6 @@
         "zendframework/zend-session": "^2.6.2",
         "zendframework/zend-serializer": "^2.6.1",
         "zendframework/zend-text": "^2.6",
-        "zendframework/zend-uri": "^2.5",
         "zendframework/zend-validator": "^2.6",
         "zendframework/zend-version": "^2.5",
         "zendframework/zend-view": "^2.6.3",
@@ -60,7 +60,6 @@
         "zendframework/zend-serializer": "Zend\\Serializer component",
         "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
         "zendframework/zend-text": "Zend\\Text component",
-        "zendframework/zend-uri": "Zend\\Uri component",
         "zendframework/zend-validator": "Zend\\Validator component",
         "zendframework/zend-version": "Zend\\Version component",
         "zendframework/zend-view": "Zend\\View component"

composer.lock

@@ -293,8 +293,7 @@ public function notFoundAction()
     public function dispatch(Request $request, Response $response = null)
     {
         if (! $request instanceof HttpRequest) {
-            throw new Exception\InvalidArgumentException(
-                    'Expected an HTTP request');
+            throw new Exception\InvalidArgumentException('Expected an HTTP request');
         }
 
         return parent::dispatch($request, $response);
@@ -316,8 +315,7 @@ public function onDispatch(MvcEvent $e)
              * @todo Determine requirements for when route match is missing.
              *       Potentially allow pulling directly from request metadata?
              */
-            throw new Exception\DomainException(
-                    'Missing route matches; unsure how to retrieve action');
+            throw new Exception\DomainException('Missing route matches; unsure how to retrieve action');
         }
 
         $request = $e->getRequest();
@@ -535,7 +533,7 @@ public function addHttpMethodHandler($method, /* Callable */ $handler)
      * Attempts to see if an identifier was passed in either the URI or the
      * query string, returning it if found. Otherwise, returns a boolean false.
      *
-     * @param  \Zend\Mvc\Router\RouteMatch $routeMatch
+     * @param  \Zend\Router\RouteMatch $routeMatch
      * @param  Request $request
      * @return false|mixed
      */

src/Controller/AbstractRestfulController.php

@@ -14,7 +14,7 @@
 use Zend\Mvc\Exception;
 use Zend\Mvc\InjectApplicationEventInterface;
 use Zend\Mvc\MvcEvent;
-use Zend\Mvc\Router\RouteMatch;
+use Zend\Router\RouteMatch;
 use Zend\Stdlib\CallbackHandler;
 
 class Forward extends AbstractPlugin

src/Controller/Plugin/Forward.php

@@ -15,7 +15,7 @@
 use Zend\Mvc\InjectApplicationEventInterface;
 use Zend\Mvc\ModuleRouteListener;
 use Zend\Mvc\MvcEvent;
-use Zend\Mvc\Router\RouteStackInterface;
+use Zend\Router\RouteStackInterface;
 
 class Url extends AbstractPlugin
 {

src/Controller/Plugin/Url.php

@@ -12,6 +12,7 @@
 use ArrayObject;
 use Zend\EventManager\AbstractListenerAggregate;
 use Zend\EventManager\EventManagerInterface;
+use Zend\Router\RouteMatch;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 use Zend\Stdlib\ArrayUtils;
 
@@ -76,7 +77,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
     public function onDispatch(MvcEvent $e)
     {
         $routeMatch        = $e->getRouteMatch();
-        $controllerName    = $routeMatch instanceof Router\RouteMatch
+        $controllerName    = $routeMatch instanceof RouteMatch
             ? $routeMatch->getParam('controller', 'not-found')
             : 'not-found';
         $application       = $e->getApplication();

src/DispatchListener.php

@@ -11,6 +11,7 @@
 
 use Zend\EventManager\AbstractListenerAggregate;
 use Zend\EventManager\EventManagerInterface;
+use Zend\Router\RouteMatch;
 
 class ModuleRouteListener extends AbstractListenerAggregate
 {
@@ -42,7 +43,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
     public function onRoute(MvcEvent $e)
     {
         $matches = $e->getRouteMatch();
-        if (!$matches instanceof Router\RouteMatch) {
+        if (!$matches instanceof RouteMatch) {
             // Can't do anything without a route match
             return;
         }

src/ModuleRouteListener.php

@@ -10,6 +10,8 @@
 namespace Zend\Mvc;
 
 use Zend\EventManager\Event;
+use Zend\Router\RouteMatch;
+use Zend\Router\RouteStackInterface;
 use Zend\Stdlib\RequestInterface as Request;
 use Zend\Stdlib\ResponseInterface as Response;
 use Zend\View\Model\ModelInterface as Model;
@@ -47,12 +49,12 @@ class MvcEvent extends Event
     protected $result;
 
     /**
-     * @var Router\RouteStackInterface
+     * @var RouteStackInterface
      */
     protected $router;
 
     /**
-     * @var null|Router\RouteMatch
+     * @var null|RouteMatch
      */
     protected $routeMatch;
 
@@ -87,7 +89,7 @@ public function getApplication()
     /**
      * Get router
      *
-     * @return Router\RouteStackInterface
+     * @return RouteStackInterface
      */
     public function getRouter()
     {
@@ -97,10 +99,10 @@ public function getRouter()
     /**
      * Set router
      *
-     * @param Router\RouteStackInterface $router
+     * @param RouteStackInterface $router
      * @return MvcEvent
      */
-    public function setRouter(Router\RouteStackInterface $router)
+    public function setRouter(RouteStackInterface $router)
     {
         $this->setParam('router', $router);
         $this->router = $router;
@@ -110,7 +112,7 @@ public function setRouter(Router\RouteStackInterface $router)
     /**
      * Get route match
      *
-     * @return null|Router\RouteMatch
+     * @return null|RouteMatch
      */
     public function getRouteMatch()
     {
@@ -120,10 +122,10 @@ public function getRouteMatch()
     /**
      * Set route match
      *
-     * @param Router\RouteMatch $matches
+     * @param RouteMatch $matches
      * @return MvcEvent
      */
-    public function setRouteMatch(Router\RouteMatch $matches)
+    public function setRouteMatch(RouteMatch $matches)
     {
         $this->setParam('route-match', $matches);
         $this->routeMatch = $matches;