More conditions on injecting zend-router configuration

zend-router is always required, so we need to check for the absence of
v2 routing classes before injecting zend-router configuration.

Similarly, in the `UrlTest`, we need to set the types to test against based on
presence of v2 routing classes, not v3 routing classes.

Author: weierophinney

test/Helper/Navigation/AbstractTest.php

@@ -138,7 +138,7 @@ protected function setUp()
 
         (new ServiceManagerConfig())->configureServiceManager($sm);
 
-        if (class_exists(RouterConfigProvider::class)) {
+        if (! class_exists(V2RouteMatch::class) && class_exists(RouterConfigProvider::class)) {
             $routerConfig = new Config((new RouterConfigProvider())->getDependencyConfig());
             $routerConfig->configureServiceManager($sm);
         }

test/Helper/UrlIntegrationTest.php

@@ -68,7 +68,7 @@ protected function setUp()
         $this->serviceManager = new ServiceManager();
         (new ServiceManagerConfig($serviceConfig))->configureServiceManager($this->serviceManager);
 
-        if (class_exists(RouterConfigProvider::class)) {
+        if (! class_exists(V2HttpRoute\Literal::class) && class_exists(RouterConfigProvider::class)) {
             $routerConfig = new Config((new RouterConfigProvider())->getDependencyConfig());
             $routerConfig->configureServiceManager($this->serviceManager);
         }

test/Helper/UrlTest.php

@@ -52,29 +52,30 @@ class UrlTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->routeMatchType = class_exists(NextGenRouteMatch::class)
-            ? NextGenRouteMatch::class
-            : RouteMatch::class;
+        $this->routeMatchType = class_exists(RouteMatch::class)
+            ? RouteMatch::class
+            : NextGenRouteMatch::class;
 
-        $this->literalRouteType = class_exists(NextGenLiteralRoute::class)
-            ? NextGenLiteralRoute::class
-            : LiteralRoute::class;
+        $this->literalRouteType = class_exists(LiteralRoute::class)
+            ? LiteralRoute::class
+            : NextGenLiteralRoute::class;
 
-        $this->segmentRouteType = class_exists(NextGenSegmentRoute::class)
-            ? NextGenSegmentRoute::class
-            : SegmentRoute::class;
+        $this->segmentRouteType = class_exists(SegmentRoute::class)
+            ? SegmentRoute::class
+            : NextGenSegmentRoute::class;
 
-        $this->treeRouteStackType = class_exists(NextGenTreeRouteStack::class)
-            ? NextGenTreeRouteStack::class
-            : TreeRouteStack::class;
+        $this->treeRouteStackType = class_exists(TreeRouteStack::class)
+            ? TreeRouteStack::class
+            : NextGenTreeRouteStack::class;
 
-        $this->wildcardRouteType = class_exists(NextGenWildcardRoute::class)
-            ? NextGenWildcardRoute::class
-            : WildcardRoute::class;
+        $this->wildcardRouteType = class_exists(WildcardRoute::class)
+            ? WildcardRoute::class
+            : NextGenWildcardRoute::class;
+
+        $routerClass = class_exists(Router::class)
+            ? Router::class
+            : NextGenRouter::class;
 
-        $routerClass = class_exists(NextGenRouter::class)
-            ? NextGenRouter::class
-            : Router::class;
         $router = new $routerClass();
         $router->addRoute('home', [
             'type' => $this->literalRouteType,