Merge branch 'hotfix/71' into develop

Forward port #71

Author: weierophinney

CHANGELOG.md

@@ -91,7 +91,7 @@ All notable changes to this project will be documented in this file, in reverse
     factories by default. You can force it to do so by passing an optional
     second argument, a boolean flag, with a value of boolean true.
 
-## 2.6.2 - TBD
+## 2.6.2 - 2016-02-22
 
 ### Added
 
@@ -107,7 +107,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/ViewHelperManagerFactory.php

@@ -47,7 +47,29 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         $options = $options ?: [];
+        $options['factories'] = isset($options['factories']) ? $options['factories'] : [];
+        $plugins = parent::__invoke($container, $requestedName, $options);
+
+        // 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)) {
                 continue;
@@ -66,35 +88,55 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             $options = ArrayUtils::merge($options, $config->toArray());
         }
 
-        $config = $container->has('config') ? $container->get('config') : [];
-
-        $options['factories'] = isset($options['factories']) ? $options['factories'] : [];
-
-        // Configure URL view helper factory
-        $options['factories'][ViewHelper\Url::class] = $this->createUrlHelperFactory();
-
-        // Configure basepath view helper factory
-        $options['factories'][ViewHelper\BasePath::class] = $this->createBasePathHelperFactory($config);
-
-        // Configure doctype view helper factory
-        $options['factories'][ViewHelper\Doctype::class] = $this->createDoctypeHelperFactory();
+        $plugins->configure($options);
+        return $plugins;
+    }
 
-        return parent::__invoke($container, $requestedName, $options);
+    /**
+     * 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 a factory for the "url" view helper
+     * 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()
+    private function createUrlHelperFactory(ContainerInterface $services)
     {
-        return function ($container, $name, array $options = null) {
+        return function () use ($services) {
             $helper = new ViewHelper\Url;
             $router = Console::isConsole() ? 'HttpRouter' : 'Router';
-            $helper->setRouter($container->get($router));
+            $helper->setRouter($services->get($router));
 
-            $match = $container->get('application')
+            $match = $services->get('application')
                 ->getMvcEvent()
                 ->getRouteMatch()
             ;
@@ -107,16 +149,17 @@ private function createUrlHelperFactory()
         };
     }
 
-    /**
-     * Create a factory for the "basepath" view helper
+     * Create and return a factory for creating a BasePath helper.
      *
-     * @param  array $config
+     * Uses configuration and request services to configure the helper.
+     *
+     * @param ContainerInterface $services
      * @return callable
      */
-    private function createBasePathHelperFactory($config)
+    private function createBasePathHelperFactory(ContainerInterface $services)
     {
-        return function ($container, $name, array $options = null) {
-            $config = $container->has('config') ? $container->get('config') : [];
+        return function () use ($services) {
+            $config = $services->has('config') ? $services->get('config') : [];
             $helper = new ViewHelper\BasePath;
 
             if (Console::isConsole()
@@ -131,7 +174,8 @@ private function createBasePathHelperFactory($config)
                 return $helper;
             }
 
-            $request = $container->get('Request');
+            $request = $services->get('Request');
+
             if (is_callable([$request, 'getBasePath'])) {
                 $helper->setBasePath($request->getBasePath());
             }
@@ -141,19 +185,18 @@ private function createBasePathHelperFactory($config)
     }
 
     /**
-     * Configure doctype view helper with doctype from configuration, if available.
+     * 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.
+     * 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()
+    private function createDoctypeHelperFactory(ContainerInterface $services)
     {
-        return function ($container, $name, array $options = null) {
-            $config = $container->has('config') ? $container->get('config') : [];
+        return function () use ($services) {
+            $config = $services->has('config') ? $services->get('config') : [];
             $config = isset($config['view_manager']) ? $config['view_manager'] : [];
             $helper = new ViewHelper\Doctype;
             if (isset($config['doctype']) && $config['doctype']) {

test/Service/HydratorManagerFactoryTest.php

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