minor #23492 [DI] Check privates before resolving alias in Container::initialized (ro0NL)

nicolas-grekas · nicolas-grekas · commit de5c60de0ee7 · 2017-07-13T10:47:41.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [DI] Check privates before resolving alias in Container::initialized | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no, fixes an existing one | Tests pass? | yes, we dont test this behavior :( | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  Continuation of #22803, so it's consistent with logic in `has()` etc. Commits ------- c4b6066 [DI] Check privates before resolving alias in Container::initialized
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`