Merge branch 'hotfix/3439' into develop

Forward port zendframework/zendframework#3439

src/ServiceManager.php

@@ -223,7 +223,7 @@ public function retrieveFromPeeringManagerFirst()
      * @return ServiceManager
      * @throws Exception\InvalidServiceNameException
      */
-    public function setInvokableClass($name, $invokableClass, $shared = true)
+    public function setInvokableClass($name, $invokableClass, $shared = null)
     {
         $cName = $this->canonicalizeName($name);
 
@@ -237,6 +237,10 @@ public function setInvokableClass($name, $invokableClass, $shared = true)
             $this->unregisterService($cName);
         }
 
+        if ($shared === null) {
+            $shared = $this->shareByDefault();
+        }
+
         $this->invokableClasses[$cName] = $invokableClass;
         $this->shared[$cName]           = (bool) $shared;
 
@@ -253,7 +257,7 @@ public function setInvokableClass($name, $invokableClass, $shared = true)
      * @throws Exception\InvalidArgumentException
      * @throws Exception\InvalidServiceNameException
      */
-    public function setFactory($name, $factory, $shared = true)
+    public function setFactory($name, $factory, $shared = null)
     {
         $cName = $this->canonicalizeName($name);
 
@@ -273,6 +277,10 @@ public function setFactory($name, $factory, $shared = true)
             $this->unregisterService($cName);
         }
 
+        if ($shared === null) {
+            $shared = $this->shareByDefault();
+        }
+
         $this->factories[$cName] = $factory;
         $this->shared[$cName]    = (bool) $shared;
 
@@ -352,7 +360,7 @@ public function addInitializer($initializer, $topOfStack = true)
      * @return ServiceManager
      * @throws Exception\InvalidServiceNameException
      */
-    public function setService($name, $service, $shared = true)
+    public function setService($name, $service, $shared = null)
     {
         $cName = $this->canonicalizeName($name);
 
@@ -367,6 +375,10 @@ public function setService($name, $service, $shared = true)
             $this->unregisterService($cName);
         }
 
+        if ($shared === null) {
+            $shared = $this->shareByDefault();
+        }
+
         $this->instances[$cName] = $service;
         $this->shared[$cName]    = (bool) $shared;
         return $this;
@@ -458,7 +470,10 @@ public function get($name, $usePeeringServiceManagers = true)
             ));
         }
 
-        if ($this->shareByDefault() && (!isset($this->shared[$cName]) || $this->shared[$cName] === true)) {
+        if (
+            ($this->shareByDefault() && !isset($this->shared[$cName]))
+            || (isset($this->shared[$cName]) && $this->shared[$cName] === true)
+        ) {
             $this->instances[$cName] = $instance;
         }
 

test/ServiceManagerTest.php

@@ -208,6 +208,23 @@ public function testGetThrowsExceptionOnUnknownService()
         $this->assertEquals('bar', $this->serviceManager->get('foo'));
     }
 
+    /**
+     * @covers Zend\ServiceManager\ServiceManager::get
+     */
+    public function testGetUsesIndivualSharedSettingWhenSetAndDeviatesFromShareByDefaultSetting()
+    {
+        $this->serviceManager->setAllowOverride(true);
+        $this->serviceManager->setShareByDefault(false);
+        $this->serviceManager->setInvokableClass('foo', 'ZendTest\ServiceManager\TestAsset\Foo');
+        $this->serviceManager->setShared('foo', true);
+        $this->assertSame($this->serviceManager->get('foo'), $this->serviceManager->get('foo'));
+
+        $this->serviceManager->setShareByDefault(true);
+        $this->serviceManager->setInvokableClass('foo', 'ZendTest\ServiceManager\TestAsset\Foo');
+        $this->serviceManager->setShared('foo', false);
+        $this->assertNotSame($this->serviceManager->get('foo'), $this->serviceManager->get('foo'));
+    }
+
     /**
      * @covers Zend\ServiceManager\ServiceManager::get
      */