Merge remote-tracking branch 'zend-servicemanager/develop' into feature/bench

Author: ezimuel

src/ServiceManager.php

@@ -147,7 +147,7 @@ public function __construct(array $config = [])
     public function withConfig(array $config)
     {
         $container                  = clone $this;
-        $container->creationContext = $container;
+        $container->creationContext = ($this === $this->creationContext) ? $container : $this->creationContext;
         $container->configure($config);
         return $container;
     }
@@ -166,6 +166,16 @@ public function get($name)
             return $this->services[$requestedName];
         }
 
+        // Next, if the alias should be shared, and we have cached the resolved
+        // service, use it.
+        if ($requestedName !== $name
+            && (! isset($this->shared[$requestedName]) || $this->shared[$requestedName])
+            && isset($this->services[$name])
+        ) {
+            $this->services[$requestedName] = $this->services[$name];
+            return $this->services[$name];
+        }
+
         // At this point, we need to create the instance; we use the resolved
         // name for that.
         $object = $this->doCreate($name);

test/AbstractPluginManagerTest.php

@@ -164,4 +164,52 @@ function ($container, $name, $callback) {
         );
         $this->assertEquals('bar', $instance->foo);
     }
+
+    public function testWithConfigProperlySetsCreationContextToOriginalCreationContext()
+    {
+        $config = [
+            'factories' => [
+                InvokableObject::class => new InvokableFactory(),
+            ],
+        ];
+
+        $services = new ServiceManager();
+        $plugins  = new SimplePluginManager($services);
+
+        $revised = $plugins->withConfig(['factories' => [
+            'foo' => function ($container, $name) {
+            },
+        ]]);
+
+        $this->assertAttributeSame($services, 'creationContext', $revised);
+    }
+
+    /**
+     * Overrides test from CommonServiceLocatorBehaviorsTrait
+     *
+     * Behavior of creation context differs for plugin managers.
+     */
+    public function testCanCreateNewLocatorWithMergedConfig()
+    {
+        $serviceManager = $this->createContainer([
+            'factories' => [
+                DateTime::class => InvokableFactory::class
+            ]
+        ]);
+
+        $newServiceManager = $serviceManager->withConfig([
+            'factories' => [
+                stdClass::class => InvokableFactory::class
+            ]
+        ]);
+
+        $this->assertTrue($serviceManager->has(DateTime::class));
+        $this->assertFalse($serviceManager->has(stdClass::class));
+
+        $this->assertTrue($newServiceManager->has(DateTime::class));
+        $this->assertTrue($newServiceManager->has(stdClass::class));
+
+        // Make sure the context has been updated for the new container
+        $this->assertAttributeSame($this->creationContext, 'creationContext', $newServiceManager);
+    }
 }

test/ServiceManagerTest.php

@@ -221,4 +221,23 @@ public function testSharedServicesReferencingAliasShouldBeHonored()
 
         $this->assertNotSame($instance1, $instance2);
     }
+
+    public function testAliasToAnExplicitServiceShouldWork()
+    {
+        $config = [
+            'aliases' => [
+                'Invokable' => InvokableObject::class,
+            ],
+            'services' => [
+                InvokableObject::class => new InvokableObject(),
+            ],
+        ];
+
+        $serviceManager = new ServiceManager($config);
+
+        $service = $serviceManager->get(InvokableObject::class);
+        $alias   = $serviceManager->get('Invokable');
+
+        $this->assertSame($service, $alias);
+    }
 }