Merge branch 'hotfix/21-instanceof-missing-dep'

Close #21

Author: weierophinney

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+### Changed
+
+- Nothing.
+
 ### Deprecated
 
 - Nothing.
@@ -18,7 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#21](https://github.com/zendframework/zend-mvc-console/pull/21) adds a missing import statement for `Zend\Router\RouteMatch` to the
+  `ConsoleViewHelperManagerDelegatorFactory` class.
 
 ## 1.1.11 - 2016-08-29
 

src/Service/ConsoleViewHelperManagerDelegatorFactory.php

@@ -9,6 +9,7 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Console\Console;
+use Zend\Router\RouteMatch;
 use Zend\ServiceManager\DelegatorFactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View\Helper as ViewHelper;

test/Service/ConsoleViewHelperManagerDelegatorFactoryTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      http://github.com/zendframework/zend-mvc-console for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -10,7 +10,12 @@
 use Interop\Container\ContainerInterface;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
+use ReflectionMethod;
+use Zend\Mvc\Application;
 use Zend\Mvc\Console\Service\ConsoleViewHelperManagerDelegatorFactory;
+use Zend\Mvc\MvcEvent;
+use Zend\Router\RouteMatch;
+use Zend\Router\RouteStackInterface;
 use Zend\View\HelperPluginManager;
 use Zend\View\Helper;
 
@@ -57,4 +62,30 @@ public function testInjectsPluginFactoriesWhenInConsoleEnvironment()
             $this->factory->__invoke($this->container, 'ViewHelperManager', $this->callback)
         );
     }
+
+    public function testCreateUrlHelperFactoryInjectsHelperWithRouterAndRouteMatchWhenPresent()
+    {
+        $container = $this->prophesize(ContainerInterface::class);
+
+        $router = $this->prophesize(RouteStackInterface::class);
+        $container->get('HttpRouter')->will([$router, 'reveal']);
+
+        $routeMatch = $this->prophesize(RouteMatch::class);
+
+        $mvcEvent = $this->prophesize(MvcEvent::class);
+        $mvcEvent->getRouteMatch()->will([$routeMatch, 'reveal']);
+
+        $application = $this->prophesize(Application::class);
+        $application->getMvcEvent()->will([$mvcEvent, 'reveal']);
+        $container->get('Application')->will([$application, 'reveal']);
+
+        $r = new ReflectionMethod($this->factory, 'createUrlHelperFactory');
+        $r->setAccessible(true);
+        $factory = $r->invoke($this->factory, $container->reveal());
+
+        $helper = $factory();
+
+        $this->assertAttributeSame($router->reveal(), 'router', $helper);
+        $this->assertAttributeSame($routeMatch->reveal(), 'routeMatch', $helper);
+    }
 }