Merge branch 'hotfix/allow-set-shared-for-abstract-factory-stuff' of h…

…ttps://github.com/protecinnovations/zf2 into hotfix/2683
zendframework · Oct 5, 2012 · 08c44a5 · 08c44a5
2 parents a3963a7 + a9ad6db
commit 08c44a5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/library/Zend/ServiceManager/ServiceManager.php b/library/Zend/ServiceManager/ServiceManager.php
@@ -385,7 +385,11 @@ public function setShared($name, $isShared)
     {
         $cName = $this->canonicalizeName($name);
 
-        if (!isset($this->invokableClasses[$cName]) && !isset($this->factories[$cName])) {
+        if (
+            !isset($this->invokableClasses[$cName])
+            && !isset($this->factories[$cName])
+            && !$this->canCreateFromAbstractFactory($cName, $name)
+        ) {
             throw new Exception\ServiceNotFoundException(sprintf(
                 '%s: A service by the name "%s" was not found and could not be marked as shared',
                 __METHOD__,

diff --git a/tests/ZendTest/ServiceManager/ServiceManagerTest.php b/tests/ZendTest/ServiceManager/ServiceManagerTest.php
@@ -141,7 +141,6 @@ public function testAddInitializerThrowsExceptionOnInvalidInitializer()
         $this->serviceManager->addInitializer(5);
     }
 
-
     /**
      * @covers Zend\ServiceManager\ServiceManager::setService
      */
@@ -161,6 +160,16 @@ public function testSetShared()
         $this->assertSame($this->serviceManager, $ret);
     }
 
+    /**
+     * @covers Zend\ServiceManager\ServiceManager::setShared
+     */
+    public function testSetSharedAbstractFactory()
+    {
+        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\FooAbstractFactory');
+        $ret = $this->serviceManager->setShared('foo', false);
+        $this->assertSame($this->serviceManager, $ret);
+    }
+
     /**
      * @covers Zend\ServiceManager\ServiceManager::setShared
      */
@@ -197,7 +206,6 @@ public function testGetThrowsExceptionOnUnknownService()
         $this->assertEquals('bar', $this->serviceManager->get('foo'));
     }
 
-
     /**
      * @covers Zend\ServiceManager\ServiceManager::get
      */
@@ -536,6 +544,7 @@ public function testShouldRaiseExceptionIfInitializerClassIsNotAnInitializerInte
     public function duplicateService()
     {
         $self = $this;
+
         return array(
             array(
                 'setFactory',