[DI] Check privates before resolving alias in Container::initialized

ro0NL · ro0NL · commit c4b6066c9f16 · 2017-07-12T20:41:02.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -366,14 +366,14 @@ public function initialized($id)
             return false;
         }
 
-        if (isset($this->aliases[$id])) {
-            $id = $this->aliases[$id];
-        }
-
         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);
         }
 
+        if (isset($this->aliases[$id])) {
+            $id = $this->aliases[$id];
+        }
+
         return isset($this->services[$id]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -366,14 +366,14 @@ public function initialized($id)`
`366`	`366`	`return false;`
`367`	`367`	`}`
`368`	`368`
`369`		`- if (isset($this->aliases[$id])) {`
`370`		`- $id = $this->aliases[$id];`
`371`		`- }`
`372`		`-`
`373`	`369`	`if (isset($this->privates[$id])) {`
`374`	`370`	`@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);`
`375`	`371`	`}`
`376`	`372`
	`373`	`+ if (isset($this->aliases[$id])) {`
	`374`	`+ $id = $this->aliases[$id];`
	`375`	`+ }`
	`376`	`+`
`377`	`377`	`return isset($this->services[$id]);`
`378`	`378`	`}`
`379`	`379`