Merge branch '3.2' into 3.3

* 3.2:
  [Yaml] Add missing deprecation annotation
  [DI] Check for privates before shared services

Author: nicolas-grekas

Container.php

@@ -231,17 +231,16 @@ public function has($id)
             if ('service_container' === $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->aliases[$id])) {
                 $id = $this->aliases[$id];
             }
             if (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;
             }
@@ -293,6 +292,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];
@@ -331,9 +334,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

@@ -736,9 +736,6 @@ public function compile(/*$resolveEnvPlaceholders = false*/)
         $compiler->compile($this);
 
         foreach ($this->definitions as $id => $definition) {
-            if (!$definition->isPublic()) {
-                $this->privates[$id] = true;
-            }
             if ($this->trackResources && $definition->isLazy()) {
                 $this->getReflectionClass($definition->getClass());
             }

Tests/ContainerTest.php

@@ -147,7 +147,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()');
     }
 
     /**
@@ -453,7 +453,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);
     }
 
     /**
@@ -463,7 +464,8 @@ public function testChangeInternalPrivateServiceIsDeprecated()
     public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
     {
         $c = new ProjectServiceContainer();
-        $c->has('internal');
+        $c->get('internal_dependency');
+        $this->assertTrue($c->has('internal'));
     }
 
     /**
@@ -473,6 +475,7 @@ public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
     public function testRequestAnInternalSharedPrivateServiceIsDeprecated()
     {
         $c = new ProjectServiceContainer();
+        $c->get('internal_dependency');
         $c->get('internal');
     }
 
@@ -504,6 +507,7 @@ class ProjectServiceContainer extends Container
         'circular' => 'getCircularService',
         'throw_exception' => 'getThrowExceptionService',
         'throws_exception_on_service_configuration' => 'getThrowsExceptionOnServiceConfigurationService',
+        'internal_dependency' => 'getInternalDependencyService',
     );
 
     public function __construct()
@@ -520,7 +524,7 @@ public function __construct()
 
     protected function getInternalService()
     {
-        return $this->__internal;
+        return $this->services['internal'] = $this->__internal;
     }
 
     protected function getBarService()
@@ -554,6 +558,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