Merge branch '3.2' into 3.3

* 3.2:
  [DI] Check privates before aliases consistently

Author: nicolas-grekas

Container.php

@@ -228,12 +228,12 @@ public function set($id, $service)
     public function has($id)
     {
         for ($i = 2;;) {
-            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 ('service_container' === $id) {
+                return true;
+            }
             if (isset($this->aliases[$id])) {
                 $id = $this->aliases[$id];
             }
@@ -286,15 +286,15 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
         // this method can be called thousands of times during a request, avoid
         // calling $this->normalizeId($id) unless necessary.
         for ($i = 2;;) {
+            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);
+            }
             if ('service_container' === $id) {
                 return $this;
             }
             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])) {