Merge branch '3.3' into 3.4

* 3.3:
  [DI] Resolve aliases earlier
  [DI] Mark Container::$privates as internal
  [DI] Minor dumping logic simplification
  bumped Symfony version to 3.3.6
  updated VERSION for 3.3.5
  updated CHANGELOG for 3.3.5
  bumped Symfony version to 3.2.13
  updated VERSION for 3.2.12
  updated CHANGELOG for 3.2.12
  bumped Symfony version to 2.8.26
  updated VERSION for 2.8.25
  updated CHANGELOG for 2.8.25
  bumped Symfony version to 2.7.33
  updated VERSION for 2.7.32
  update CONTRIBUTORS for 2.7.32
  updated CHANGELOG for 2.7.32

Author: nicolas-grekas

Container.php

@@ -56,10 +56,14 @@ class Container implements ResettableContainerInterface
 
     protected $services = array();
     protected $methodMap = array();
-    protected $privates = array();
     protected $aliases = array();
     protected $loading = array();
 
+    /**
+     * @internal
+     */
+    protected $privates = array();
+
     /**
      * @internal
      */
@@ -221,15 +225,15 @@ public function has($id)
             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];
             }
             if (isset($this->services[$id])) {
                 return true;
             }
+            if ('service_container' === $id) {
+                return true;
+            }
 
             if (isset($this->methodMap[$id])) {
                 return true;
@@ -279,9 +283,6 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             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];
             }
@@ -290,6 +291,9 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             if (isset($this->services[$id])) {
                 return $this->services[$id];
             }
+            if ('service_container' === $id) {
+                return $this;
+            }
 
             if (isset($this->loading[$id])) {
                 throw new ServiceCircularReferenceException($id, array_keys($this->loading));
@@ -352,10 +356,6 @@ public function initialized($id)
     {
         $id = $this->normalizeId($id);
 
-        if ('service_container' === $id) {
-            return false;
-        }
-
         if (isset($this->privates[$id])) {
             @trigger_error(sprintf('Checking for the initialization of the "%s" private service is deprecated since Symfony 3.4 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
         }
@@ -364,6 +364,10 @@ public function initialized($id)
             $id = $this->aliases[$id];
         }
 
+        if ('service_container' === $id) {
+            return false;
+        }
+
         return isset($this->services[$id]);
     }
 

Dumper/PhpDumper.php

@@ -1605,6 +1605,10 @@ private function dumpParameter($name)
      */
     private function getServiceCall($id, Reference $reference = null)
     {
+        while ($this->container->hasAlias($id)) {
+            $id = (string) $this->container->getAlias($id);
+        }
+
         if ('service_container' === $id) {
             return '$this';
         }
@@ -1621,7 +1625,7 @@ private function getServiceCall($id, Reference $reference = null)
             $code = sprintf('$this->get(\'%s\')', $id);
         }
 
-        if ($this->container->hasDefinition($id) && (!$this->container->getDefinition($id)->isPublic() || $this->container->getDefinition($id)->isShared())) {
+        if ($this->container->hasDefinition($id) && $this->container->getDefinition($id)->isShared()) {
             // The following is PHP 5.5 syntax for what could be written as "(\$this->services['$id'] ?? $code)" on PHP>=7.0
 
             $code = "\${(\$_ = isset(\$this->services['$id']) ? \$this->services['$id'] : $code) && false ?: '_'}";