Merge branch 'master' of git://github.com/richardjennings/zf2 into ho…

…tfix/3237
muhd7rosli · Dec 18, 2012 · 60a0760 · 60a0760
2 parents a5f5a79 + 7df22b4
commit 60a0760
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/library/Zend/ServiceManager/ServiceManager.php b/library/Zend/ServiceManager/ServiceManager.php
@@ -892,8 +892,8 @@ protected function createFromAbstractFactory($canonicalName, $requestedName)
                 ));
             }
             try {
-                $this->pendingAbstractFactoryRequests[get_class($abstractFactory)] = $requestedName;
                 if ($abstractFactory->canCreateServiceWithName($this, $canonicalName, $requestedName)) {
+                    $this->pendingAbstractFactoryRequests[get_class($abstractFactory)] = $requestedName;
                     $instance = $this->createServiceViaCallback(
                         array($abstractFactory, 'createServiceWithName'),
                         $canonicalName,

diff --git a/tests/ZendTest/ServiceManager/ServiceManagerTest.php b/tests/ZendTest/ServiceManager/ServiceManagerTest.php
@@ -654,4 +654,17 @@ public function testCanGetAliasedServicesFromPeeringServiceManagers()
 
         $this->assertSame($service, $this->serviceManager->get('alias-name'));
     }
+
+    /**
+     * @covers Zend\ServiceManager\ServiceManager::get
+     */
+    public function testDuplicateNewInstanceMultipleAbstractFactories()
+    {
+        $this->serviceManager->setAllowOverride(true);
+        $this->serviceManager->setShareByDefault(false);
+        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\BarAbstractFactory');
+        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\FooAbstractFactory');
+        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
+        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
+    }
 }