Make sure all services are shared by default

Author: michalbundyra

src/DelegatorTestTrait.php

@@ -9,9 +9,11 @@
 
 namespace Zend\ContainerTest;
 
+use Generator;
+
 trait DelegatorTestTrait
 {
-    public function testDelegatorForInvokable()
+    public function testDelegatorForInvokable() : void
     {
         $config = [
             'invokables' => [
@@ -30,9 +32,10 @@ public function testDelegatorForInvokable()
         $delegator = $container->get('foo-bar');
         self::assertInstanceOf(TestAsset\Delegator::class, $delegator);
         self::assertInstanceOf(TestAsset\Service::class, ($delegator->callback)());
+        self::assertSame($delegator, $container->get('foo-bar'));
     }
 
-    public function testDelegatorForService()
+    public function testDelegatorForService() : void
     {
         $myService = new TestAsset\Service();
         $config = [
@@ -52,9 +55,10 @@ public function testDelegatorForService()
         $delegator = $container->get('foo-bar');
         self::assertInstanceOf(TestAsset\Delegator::class, $delegator);
         self::assertSame($myService, ($delegator->callback)());
+        self::assertSame($delegator, $container->get('foo-bar'));
     }
 
-    public function testDelegatorForFactory()
+    public function testDelegatorForFactory() : void
     {
         $config = [
             'factories' => [
@@ -73,9 +77,10 @@ public function testDelegatorForFactory()
         $delegator = $container->get('foo-bar');
         self::assertInstanceOf(TestAsset\Delegator::class, $delegator);
         self::assertInstanceOf(TestAsset\Service::class, ($delegator->callback)());
+        self::assertSame($delegator, $container->get('foo-bar'));
     }
 
-    public function testDelegatorForAliasInvokable()
+    public function testDelegatorForAliasInvokable() : void
     {
         $config = [
             'aliases' => [
@@ -97,9 +102,10 @@ public function testDelegatorForAliasInvokable()
         $delegator = $container->get('foo-bar');
         self::assertInstanceOf(TestAsset\Delegator::class, $delegator);
         self::assertInstanceOf(TestAsset\Service::class, ($delegator->callback)());
+        self::assertSame($delegator, $container->get('foo-bar'));
     }
 
-    public function testDelegatorForAliasService()
+    public function testDelegatorForAliasService() : void
     {
         $myService = new TestAsset\Service();
         $config = [
@@ -122,9 +128,10 @@ public function testDelegatorForAliasService()
         $delegator = $container->get('foo-bar');
         self::assertInstanceOf(TestAsset\Delegator::class, $delegator);
         self::assertSame($myService, ($delegator->callback)());
+        self::assertSame($delegator, $container->get('foo-bar'));
     }
 
-    public function testDelegatorForAliasFactory()
+    public function testDelegatorForAliasFactory() : void
     {
         $config = [
             'aliases' => [
@@ -146,9 +153,10 @@ public function testDelegatorForAliasFactory()
         $delegator = $container->get('foo-bar');
         self::assertInstanceOf(TestAsset\Delegator::class, $delegator);
         self::assertInstanceOf(TestAsset\Service::class, ($delegator->callback)());
+        self::assertSame($delegator, $container->get('foo-bar'));
     }
 
-    public function delegatorService()
+    public function delegatorService() : Generator
     {
         yield 'invokable' => [
             [
@@ -172,7 +180,7 @@ public function delegatorService()
     /**
      * @dataProvider delegatorService
      */
-    public function testDelegatorMultipleDelegators(array $config)
+    public function testDelegatorMultipleDelegators(array $config) : void
     {
         $config += [
             'delegators' => [
@@ -195,5 +203,6 @@ public function testDelegatorMultipleDelegators(array $config)
             ],
             $service->injected
         );
+        self::assertSame($service, $container->get('foo-bar'));
     }
 }

src/FactoryTestTrait.php

@@ -38,7 +38,9 @@ public function testFactory(array $config) : void
         $container = $this->createContainer($config);
 
         self::assertTrue($container->has('service'));
-        self::assertInstanceOf(TestAsset\Service::class, $container->get('service'));
+        $service = $container->get('service');
+        self::assertInstanceOf(TestAsset\Service::class, $service);
+        self::assertSame($service, $container->get('service'));
     }
 
     public function factoryWithName() : Generator

src/InvokableTestTrait.php

@@ -44,5 +44,6 @@ public function testInvokableWithAlias() : void
         $originService = $container->get(TestAsset\Service::class);
         self::assertInstanceOf(TestAsset\Service::class, $originService);
         self::assertSame($service, $originService);
+        self::assertSame($originService, $container->get(TestAsset\Service::class));
     }
 }

src/ServiceTestTrait.php

@@ -11,7 +11,7 @@
 
 trait ServiceTestTrait
 {
-    public function testService()
+    public function testService() : void
     {
         $service = new TestAsset\Service();
         $config = [