[DI] Check for privates before shared services

Author: ro0NL

Container.php

@@ -200,17 +200,17 @@ public function set($id, $service)
     public function has($id)
     {
         for ($i = 2;;) {
+            if (isset($this->privates[$id])) {
+                @trigger_error(sprintf('Checking for the existence of the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+            }
+
             if ('service_container' === $id
                 || isset($this->aliases[$id])
                 || isset($this->services[$id])
             ) {
                 return true;
             }
 
-            if (isset($this->privates[$id])) {
-                @trigger_error(sprintf('Checking for the existence of the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
-            }
-
             if (isset($this->methodMap[$id])) {
                 return true;
             }
@@ -262,6 +262,10 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             if (isset($this->aliases[$id])) {
                 $id = $this->aliases[$id];
             }
+            if (isset($this->privates[$id])) {
+                @trigger_error(sprintf('Requesting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+            }
+
             // Re-use shared service instance if it exists.
             if (isset($this->services[$id])) {
                 return $this->services[$id];
@@ -300,9 +304,6 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
 
                 return;
             }
-            if (isset($this->privates[$id])) {
-                @trigger_error(sprintf('Requesting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
-            }
 
             $this->loading[$id] = true;
 

ContainerBuilder.php

@@ -573,9 +573,6 @@ public function compile()
         $compiler->compile($this);
 
         foreach ($this->definitions as $id => $definition) {
-            if (!$definition->isPublic()) {
-                $this->privates[$id] = true;
-            }
             if ($this->trackResources && $definition->isLazy() && ($class = $definition->getClass()) && class_exists($class)) {
                 $this->addClassResource(new \ReflectionClass($class));
             }

Tests/ContainerTest.php

@@ -126,7 +126,7 @@ public function testGetServiceIds()
 
         $sc = new ProjectServiceContainer();
         $sc->set('foo', $obj = new \stdClass());
-        $this->assertEquals(array('service_container', 'internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'foo'), $sc->getServiceIds(), '->getServiceIds() returns defined service ids by factory methods in the method map, followed by service ids defined by set()');
+        $this->assertEquals(array('service_container', 'internal', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'internal_dependency', 'foo'), $sc->getServiceIds(), '->getServiceIds() returns defined service ids by factory methods in the method map, followed by service ids defined by set()');
     }
 
     /**
@@ -397,7 +397,8 @@ public function testUnsetInternalPrivateServiceIsDeprecated()
     public function testChangeInternalPrivateServiceIsDeprecated()
     {
         $c = new ProjectServiceContainer();
-        $c->set('internal', new \stdClass());
+        $c->set('internal', $internal = new \stdClass());
+        $this->assertSame($c->get('internal'), $internal);
     }
 
     /**
@@ -407,7 +408,8 @@ public function testChangeInternalPrivateServiceIsDeprecated()
     public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
     {
         $c = new ProjectServiceContainer();
-        $c->has('internal');
+        $c->get('internal_dependency');
+        $this->assertTrue($c->has('internal'));
     }
 
     /**
@@ -417,6 +419,7 @@ public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
     public function testRequestAnInternalSharedPrivateServiceIsDeprecated()
     {
         $c = new ProjectServiceContainer();
+        $c->get('internal_dependency');
         $c->get('internal');
     }
 }
@@ -435,6 +438,7 @@ class ProjectServiceContainer extends Container
         'circular' => 'getCircularService',
         'throw_exception' => 'getThrowExceptionService',
         'throws_exception_on_service_configuration' => 'getThrowsExceptionOnServiceConfigurationService',
+        'internal_dependency' => 'getInternalDependencyService',
     );
 
     public function __construct()
@@ -451,7 +455,7 @@ public function __construct()
 
     protected function getInternalService()
     {
-        return $this->__internal;
+        return $this->services['internal'] = $this->__internal;
     }
 
     protected function getBarService()
@@ -485,6 +489,15 @@ protected function getThrowsExceptionOnServiceConfigurationService()
 
         throw new \Exception('Something was terribly wrong while trying to configure the service!');
     }
+
+    protected function getInternalDependencyService()
+    {
+        $this->services['internal_dependency'] = $instance = new \stdClass();
+
+        $instance->internal = isset($this->services['internal']) ? $this->services['internal'] : $this->getInternalService();
+
+        return $instance;
+    }
 }
 
 class LegacyProjectServiceContainer extends Container