Merge branch 'hotfix/43' into develop

Forward port #44

Author: weierophinney

CHANGELOG.md

@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2016-02-18
 
 ### Added
 
@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#44](https://github.com/zendframework/zend-view/pull/44) fixes the
+  constructor of `HelperPluginManager` to ensure it is backwards compatible
+  with zend-servicemanager v2.
 
 ## 2.6.0 - 2016-02-17
 

src/HelperPluginManager.php

@@ -235,15 +235,16 @@ class HelperPluginManager extends AbstractPluginManager
      * Adds initializers to inject the attached renderer and translator, if
      * any, to the currently requested helper.
      *
-     * @param ContainerInterface $container
-     * @param array $config
+     * @param null|ConfigInterface|ContainerInterface $configOrContainerInstance
+     * @param array $v3config If $configOrContainerInstance is a container, this
+     *     value will be passed to the parent constructor.
      */
-    public function __construct(ContainerInterface $container, array $config = [])
+    public function __construct($configOrContainerInstance = null, array $v3config = [])
     {
         $this->initializers[] = [$this, 'injectRenderer'];
         $this->initializers[] = [$this, 'injectTranslator'];
 
-        parent::__construct($container, $config);
+        parent::__construct($configOrContainerInstance, $v3config);
     }
 
     /**

test/HelperPluginManagerTest.php

@@ -30,6 +30,32 @@ public function setUp()
         $this->helpers = new HelperPluginManager(new ServiceManager());
     }
 
+    /**
+     * @group 43
+     */
+    public function testConstructorArgumentsAreOptionalUnderV2()
+    {
+        if (method_exists($this->helpers, 'configure')) {
+            $this->markTestSkipped('zend-servicemanager v3 plugin managers require a container argument');
+        }
+
+        $helpers = new HelperPluginManager();
+        $this->assertInstanceOf(HelperPluginManager::class, $helpers);
+    }
+
+    /**
+     * @group 43
+     */
+    public function testConstructorAllowsConfigInstanceAsFirstArgumentUnderV2()
+    {
+        if (method_exists($this->helpers, 'configure')) {
+            $this->markTestSkipped('zend-servicemanager v3 plugin managers require a container argument');
+        }
+
+        $helpers = new HelperPluginManager(new Config([]));
+        $this->assertInstanceOf(HelperPluginManager::class, $helpers);
+    }
+
     public function testViewIsNullByDefault()
     {
         $this->assertNull($this->helpers->getRenderer());