Merge branch 'hotfix/71'

Close #71
Fixes zendframework/zend-view#51

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.2 - TBD
+## 2.6.2 - 2016-02-22
 
 ### Added
 
@@ -18,7 +18,13 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#71](https://github.com/zendframework/zend-mvc/pull/71) fixes the
+  `ViewHelperManagerFactory` to be backwards-compatible with v2 by ensuring that
+  the factories for each of the `url`, `basepath`, and `doctype` view helpers
+  are registered using the fully qualified class names present in
+  `Zend\View\HelperPluginManager`; these changes ensure requests for these
+  helpers resolve to these override factories, instead of the
+  `InvokableFactory`.
 
 ## 2.6.1 - 2016-02-16
 

src/Service/AbstractPluginManagerFactory.php

@@ -31,7 +31,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         /* @var $plugins AbstractPluginManager */
         $plugins = new $pluginManagerClass;
         $plugins->setServiceLocator($serviceLocator);
-        $configuration = $serviceLocator->get('Config');
+        $configuration = $serviceLocator->get('config');
 
         if (isset($configuration['di']) && $serviceLocator->has('Di')) {
             $plugins->addAbstractFactory($serviceLocator->get('DiAbstractServiceFactory'));

src/Service/ViewHelperManagerFactory.php

@@ -9,17 +9,19 @@
 
 namespace Zend\Mvc\Service;
 
+use Interop\Container\ContainerInterface;
 use Zend\Console\Console;
 use Zend\Mvc\Exception;
 use Zend\Mvc\Router\RouteMatch;
 use Zend\ServiceManager\ConfigInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View\Helper as ViewHelper;
+use Zend\View\HelperPluginManager;
 use Zend\View\Helper\HelperInterface as ViewHelperInterface;
 
 class ViewHelperManagerFactory extends AbstractPluginManagerFactory
 {
-    const PLUGIN_MANAGER_CLASS = 'Zend\View\HelperPluginManager';
+    const PLUGIN_MANAGER_CLASS = HelperPluginManager::class;
 
     /**
      * An array of helper configuration classes to ensure are on the helper_map stack.
@@ -43,29 +45,92 @@ public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $plugins = parent::createService($serviceLocator);
 
+        // Configure default helpers from other components
+        $plugins = $this->configureHelpers($plugins);
+
+        // Override plugin factories
+        $plugins = $this->injectOverrideFactories($plugins, $serviceLocator);
+
+        return $plugins;
+    }
+
+    /**
+     * Configure helpers from other components.
+     *
+     * Loops through the list of default helper configuration classes, and uses
+     * each to configure the helper plugin manager.
+     *
+     * @param HelperPluginManager $plugins
+     * @return HelperPluginManager
+     */
+    private function configureHelpers(HelperPluginManager $plugins)
+    {
         foreach ($this->defaultHelperMapClasses as $configClass) {
-            if (is_string($configClass) && class_exists($configClass)) {
-                $config = new $configClass;
-
-                if (!$config instanceof ConfigInterface) {
-                    throw new Exception\RuntimeException(sprintf(
-                        'Invalid service manager configuration class provided; received "%s", expected class implementing %s',
-                        $configClass,
-                        'Zend\ServiceManager\ConfigInterface'
-                    ));
-                }
-
-                $config->configureServiceManager($plugins);
+            if (! is_string($configClass) || ! class_exists($configClass)) {
+                continue;
+            }
+
+            $config = new $configClass;
+
+            if (! $config instanceof ConfigInterface) {
+                throw new Exception\RuntimeException(sprintf(
+                    'Invalid service manager configuration class provided; received "%s", expected class implementing %s',
+                    $configClass,
+                    'Zend\ServiceManager\ConfigInterface'
+                ));
             }
+
+            $config->configureServiceManager($plugins);
         }
 
-        // Configure URL view helper with router
-        $plugins->setFactory('url', function () use ($serviceLocator) {
+        return $plugins;
+    }
+
+    /**
+     * Inject override factories into the plugin manager.
+     *
+     * @param HelperPluginManager $plugins
+     * @param ContainerInterface $services
+     * @return HelperPluginManager
+     */
+    private function injectOverrideFactories(HelperPluginManager $plugins, ContainerInterface $services)
+    {
+        // Configure URL view helper
+        $urlFactory = $this->createUrlHelperFactory($services);
+        $plugins->setFactory(ViewHelper\Url::class, $urlFactory);
+        $plugins->setFactory('zendviewhelperurl', $urlFactory);
+
+        // Configure base path helper
+        $basePathFactory = $this->createBasePathHelperFactory($services);
+        $plugins->setFactory(ViewHelper\BasePath::class, $basePathFactory);
+        $plugins->setFactory('zendviewhelperbasepath', $basePathFactory);
+
+        // Configure doctype view helper
+        $doctypeFactory = $this->createDoctypeHelperFactory($services);
+        $plugins->setFactory(ViewHelper\doctype::class, $doctypeFactory);
+        $plugins->setFactory('zendviewhelperdoctype', $doctypeFactory);
+
+        return $plugins;
+    }
+
+    /**
+     * Create and return a factory for creating a URL helper.
+     *
+     * Retrieves the application and router from the servicemanager,
+     * and the route match from the MvcEvent composed by the application,
+     * using them to configure the helper.
+     *
+     * @param ContainerInterface $services
+     * @return callable
+     */
+    private function createUrlHelperFactory(ContainerInterface $services)
+    {
+        return function () use ($services) {
             $helper = new ViewHelper\Url;
             $router = Console::isConsole() ? 'HttpRouter' : 'Router';
-            $helper->setRouter($serviceLocator->get($router));
+            $helper->setRouter($services->get($router));
 
-            $match = $serviceLocator->get('application')
+            $match = $services->get('application')
                 ->getMvcEvent()
                 ->getRouteMatch()
             ;
@@ -75,10 +140,21 @@ public function createService(ServiceLocatorInterface $serviceLocator)
             }
 
             return $helper;
-        });
+        };
+    }
 
-        $plugins->setFactory('basepath', function () use ($serviceLocator) {
-            $config = $serviceLocator->has('Config') ? $serviceLocator->get('Config') : [];
+    /**
+     * Create and return a factory for creating a BasePath helper.
+     *
+     * Uses configuration and request services to configure the helper.
+     *
+     * @param ContainerInterface $services
+     * @return callable
+     */
+    private function createBasePathHelperFactory(ContainerInterface $services)
+    {
+        return function () use ($services) {
+            $config = $services->has('config') ? $services->get('config') : [];
             $basePathHelper = new ViewHelper\BasePath;
 
             if (Console::isConsole()
@@ -96,31 +172,35 @@ public function createService(ServiceLocatorInterface $serviceLocator)
                 return $basePathHelper;
             }
 
-            $request = $serviceLocator->get('Request');
+            $request = $services->get('Request');
 
             if (is_callable([$request, 'getBasePath'])) {
                 $basePathHelper->setBasePath($request->getBasePath());
             }
 
             return $basePathHelper;
-        });
-
-        /**
-         * Configure doctype view helper with doctype from configuration, if available.
-         *
-         * Other view helpers depend on this to decide which spec to generate their tags
-         * based on. This is why it must be set early instead of later in the layout phtml.
-         */
-        $plugins->setFactory('doctype', function () use ($serviceLocator) {
-            $config = $serviceLocator->has('Config') ? $serviceLocator->get('Config') : [];
+        };
+    }
+
+    /**
+     * Create and return a Doctype helper factory.
+     *
+     * Other view helpers depend on this to decide which spec to generate their tags
+     * based on. This is why it must be set early instead of later in the layout phtml.
+     *
+     * @param ContainerInterface $services
+     * @return callable
+     */
+    private function createDoctypeHelperFactory(ContainerInterface $services)
+    {
+        return function () use ($services) {
+            $config = $services->has('config') ? $services->get('config') : [];
             $config = isset($config['view_manager']) ? $config['view_manager'] : [];
             $doctypeHelper = new ViewHelper\Doctype;
             if (isset($config['doctype']) && $config['doctype']) {
                 $doctypeHelper->setDoctype($config['doctype']);
             }
             return $doctypeHelper;
-        });
-
-        return $plugins;
+        };
     }
 }

test/Service/HydratorManagerFactoryTest.php

@@ -21,7 +21,7 @@ public function setUp()
     {
         $this->factory = new HydratorManagerFactory();
         $this->services = $this->prophesize(ServiceLocatorInterface::class);
-        $this->services->get('Config')->willReturn([]);
+        $this->services->get('config')->willReturn([]);
     }
 
     public function testFactoryReturnsZendHydratorManagerInstance()