Rebase adjustments

tom-pryor · Apr 12, 2013 · 99ed3a5 · 99ed3a5
1 parent 21285ff
commit 99ed3a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/library/Zend/ServiceManager/ServiceManager.php b/library/Zend/ServiceManager/ServiceManager.php
@@ -326,11 +326,13 @@ public function addAbstractFactory($factory, $topOfStack = true)
      */
     public function addDelegator($serviceName, $delegatorFactoryName)
     {
-        if (!isset($this->delegators[$this->canonicalizeName($serviceName)])) {
-            $this->delegators[$this->canonicalizeName($serviceName)] = array();
+        $cName = $this->canonicalizeName($serviceName);
+
+        if (!isset($this->delegators[$cName])) {
+            $this->delegators[$cName] = array();
         }
 
-        $this->delegators[$this->canonicalizeName($serviceName)][] = $delegatorFactoryName;
+        $this->delegators[$cName][] = $delegatorFactoryName;
 
         return $this;
     }

diff --git a/tests/ZendTest/ServiceManager/ServiceManagerTest.php b/tests/ZendTest/ServiceManager/ServiceManagerTest.php
@@ -745,7 +745,7 @@ public function testUsesDelegatorWhenAvailable()
 
         $delegator
             ->expects($this->once())
-            ->method('createDelegateWithName')
+            ->method('createDelegatorWithName')
             ->with(
                 $this->serviceManager,
                 'fooservice',
@@ -762,6 +762,8 @@ public function testUsesDelegatorWhenAvailable()
             )
             ->will($this->returnValue($delegator));
 
+        //die(var_dump($this->serviceManager));
+
         $this->assertSame($delegator, $this->serviceManager->create('foo-service'));
     }