symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Container.php
Lines changed: 7 additions & 7 deletions b/‎src/Symfony/Component/DependencyInjection/Container.php
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Lines changed: 4 additions & 4 deletions
@@ -249,16 +249,16 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
         // this method can be called thousands of times during a request, avoid
         // calling strtolower() unless necessary.
         for ($i = 2;;) {
-            if ('service_container' === $id) {
-                return $this;
-            }
             if (isset($this->aliases[$id])) {
                 $id = $this->aliases[$id];
             }
             // Re-use shared service instance if it exists.
             if (isset($this->services[$id]) || array_key_exists($id, $this->services)) {
                 return $this->services[$id];
             }
+            if ('service_container' === $id) {
+                return $this;
+            }
 
             if (isset($this->loading[$id])) {
                 throw new ServiceCircularReferenceException($id, array_keys($this->loading));
@@ -328,16 +328,16 @@ public function initialized($id)
     {
         $id = strtolower($id);
 
+        if (isset($this->aliases[$id])) {
+            $id = $this->aliases[$id];
+        }
+
         if ('service_container' === $id) {
             // BC: 'service_container' was a synthetic service previously.
             // @todo Change to false in next major release.
             return true;
         }
 
-        if (isset($this->aliases[$id])) {
-            $id = $this->aliases[$id];
-        }
-
         return isset($this->services[$id]) || array_key_exists($id, $this->services);
     }
 
 
@@ -1482,6 +1482,10 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac
      */
     private function getServiceCall($id, Reference $reference = null)
     {
+        while ($this->container->hasAlias($id)) {
+            $id = (string) $this->container->getAlias($id);
+        }
+
         if ('service_container' === $id) {
             return '$this';
         }
@@ -1490,10 +1494,6 @@ private function getServiceCall($id, Reference $reference = null)
             return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
         }
 
-        if ($this->container->hasAlias($id)) {
-            $id = (string) $this->container->getAlias($id);
-        }
-
         return sprintf('$this->get(\'%s\')', $id);
     }
Original file line number	Diff line number	Diff line change
`@@ -1482,6 +1482,10 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac`
`1482`	`1482`	`*/`
`1483`	`1483`	`private function getServiceCall($id, Reference $reference = null)`
`1484`	`1484`	`{`
	`1485`	`+ while ($this->container->hasAlias($id)) {`
	`1486`	`+ $id = (string) $this->container->getAlias($id);`
	`1487`	`+ }`
	`1488`	`+`
`1485`	`1489`	`if ('service_container' === $id) {`
`1486`	`1490`	`return '$this';`
`1487`	`1491`	`}`
`@@ -1490,10 +1494,6 @@ private function getServiceCall($id, Reference $reference = null)`
`1490`	`1494`	`return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);`
`1491`	`1495`	`}`
`1492`	`1496`
`1493`		`- if ($this->container->hasAlias($id)) {`
`1494`		`- $id = (string) $this->container->getAlias($id);`
`1495`		`- }`
`1496`		`-`
`1497`	`1497`	`return sprintf('$this->get(\'%s\')', $id);`
`1498`	`1498`	`}`
`1499`	`1499`