Merge branch 'hotfix/123'

Close #123

Author: weierophinney

CHANGELOG.md

@@ -20,7 +20,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#123](https://github.com/zendframework/zend-view/pull/123) updates the
+  `HelperPluginManager` such that it no longer injects a translator in a helper
+  if one is already present.
 
 ## 2.9.0 - 2017-03-21
 

src/HelperPluginManager.php

@@ -337,6 +337,10 @@ public function injectTranslator($first, $second)
             return;
         }
 
+        if (method_exists($helper, 'hasTranslator') && $helper->hasTranslator()) {
+            return;
+        }
+
         if ($container->has('MvcTranslator')) {
             $helper->setTranslator($container->get('MvcTranslator'));
             return;

test/HelperPluginManagerTest.php

@@ -186,6 +186,28 @@ public function testInjectTranslatorWillReturnEarlyIfThePluginManagerDoesNotHave
         $this->assertNull($helper->getTranslator());
     }
 
+    public function testInjectTranslatorWillReturnEarlyIfTheHelperHasTranslatorAlready()
+    {
+        $translatorA = new Translator();
+        $translatorB = new Translator();
+        $config = new Config(['services' => [
+            'Translator' => $translatorB,
+        ]]);
+        $services = new ServiceManager();
+        $config->configureServiceManager($services);
+        $helpers = new HelperPluginManager($services);
+        $helpers->setFactory(
+            'TestHelper',
+            function () use ($translatorA) {
+                $helper = new HeadTitle();
+                $helper->setTranslator($translatorA);
+                return $helper;
+            }
+        );
+        $helperB = $helpers->get('TestHelper');
+        $this->assertSame($translatorA, $helperB->getTranslator());
+    }
+
     public function testCanOverrideAFactoryViaConfigurationPassedToConstructor()
     {
         $helper  = $this->prophesize(HelperInterface::class)->reveal();