Merge branch 'hotfix/validator-service-compat' into develop

Forward port zendframework/zendframework#4410
zendframework · May 6, 2013 · a4f47c3 · a4f47c3
commit a4f47c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ValidatorPluginManager.php b/src/ValidatorPluginManager.php
@@ -136,8 +136,8 @@ public function injectTranslator($validator)
     {
         if ($validator instanceof Translator\TranslatorAwareInterface) {
             $locator = $this->getServiceLocator();
-            if ($locator && $locator->has('translator')) {
-                $validator->setTranslator($locator->get('translator'));
+            if ($locator && $locator->has('MvcTranslator')) {
+                $validator->setTranslator($locator->get('MvcTranslator'));
             }
         }
     }

diff --git a/test/ValidatorPluginManagerTest.php b/test/ValidatorPluginManagerTest.php
@@ -29,14 +29,14 @@ public function testAllowsInjectingTranslator()
     {
         $translator = $this->getMock('ZendTest\Validator\TestAsset\Translator');
 
-        $slContents = array(array('translator', $translator));
+        $slContents = array(array('MvcTranslator', $translator));
         $serviceLocator = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
         $serviceLocator->expects($this->once())
             ->method('get')
             ->will($this->returnValueMap($slContents));
         $serviceLocator->expects($this->once())
             ->method('has')
-            ->with($this->equalTo('translator'))
+            ->with($this->equalTo('MvcTranslator'))
             ->will($this->returnValue(true));
 
         $this->validators->setServiceLocator($serviceLocator);
@@ -51,7 +51,7 @@ public function testNoTranslatorInjectedWhenTranslatorIsNotPresent()
         $serviceLocator = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
         $serviceLocator->expects($this->once())
             ->method('has')
-            ->with($this->equalTo('translator'))
+            ->with($this->equalTo('MvcTranslator'))
             ->will($this->returnValue(false));
 
         $this->validators->setServiceLocator($serviceLocator);