bug #12570 Fix initialized() with aliased services (Daniel Wehner)

fabpot · fabpot · commit 1ce8f030401a · 2014-11-25T12:27:34.000+01:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12570). Discussion ---------- Fix initialized() with aliased services | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12569 | License | MIT | Doc PR | Commits ------- a18b6d1 Fix initialized() with aliased services
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -365,6 +365,10 @@ public function initialized($id)
             return true;
         }
 
+        if (isset($this->aliases[$id])) {
+            $id = $this->aliases[$id];
+        }
+
         return isset($this->services[$id]) || array_key_exists($id, $this->services);
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -272,6 +272,10 @@ public function testInitialized()
         $this->assertTrue($sc->initialized('foo'), '->initialized() returns true if service is loaded');
         $this->assertFalse($sc->initialized('foo1'), '->initialized() returns false if service is not loaded');
         $this->assertFalse($sc->initialized('bar'), '->initialized() returns false if a service is defined, but not currently loaded');
+        $this->assertFalse($sc->initialized('alias'), '->initialized() returns false if an aliased service is not initialized');
+
+        $sc->set('bar', new \stdClass());
+        $this->assertTrue($sc->initialized('alias'), '->initialized() returns true for alias if aliased service is initialized');
     }
 
     public function testEnterLeaveCurrentScope()

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,10 @@ public function initialized($id)`
`365`	`365`	`return true;`
`366`	`366`	`}`
`367`	`367`
	`368`	`+ if (isset($this->aliases[$id])) {`
	`369`	`+ $id = $this->aliases[$id];`
	`370`	`+ }`
	`371`	`+`
`368`	`372`	`return isset($this->services[$id]) \|\| array_key_exists($id, $this->services);`
`369`	`373`	`}`
`370`	`374`