bug #17742 [DependencyInjection] Fix #16461 Container::set() replace aliases (mnapoli)

fabpot · fabpot · commit 2799b1cf04f7 · 2016-02-12T09:48:06.000+01:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17742). Discussion ---------- [DependencyInjection] Fix #16461 Container::set() replace aliases | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16461 | License | MIT | Doc PR | - `Container::set()` now overrides any previously alias defined with the same name. Please see #16461 for the background. Example: - given `event_dispatcher` is an alias to `debug.event_dispatcher` - when I run: `$container->set('event_dispatcher', new FakeEventDispatcher)` - *before this patch*: nothing happens - *after this patch*: the `event_dispatcher` is now my fake event dispatcher Commits ------- be85d16 [DependencyInjection] Fix #16461 Let Container::set() replace existing aliases
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -200,6 +200,10 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER)
             $this->scopedServices[$scope][$id] = $service;
         }
 
+        if (isset($this->aliases[$id])) {
+            unset($this->aliases[$id]);
+        }
+
         $this->services[$id] = $service;
 
         if (method_exists($this, $method = 'synchronize'.strtr($id, $this->underscoreMap).'Service')) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -217,6 +217,16 @@ public function testAddAliases()
         $this->assertTrue(isset($aliases['foobar']));
     }
 
+    public function testSetReplacesAlias()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setAlias('alias', 'aliased');
+        $builder->set('aliased', new \stdClass());
+
+        $builder->set('alias', $foo = new \stdClass());
+        $this->assertSame($foo, $builder->get('alias'), '->set() replaces an existing alias');
+    }
+
     public function testAddGetCompilerPass()
     {
         $builder = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -152,6 +152,14 @@ public function testSetAlsoSetsScopedService()
         $this->assertSame($foo, $services['foo']['foo']);
     }
 
+    public function testSetReplacesAlias()
+    {
+        $c = new ProjectServiceContainer();
+
+        $c->set('alias', $foo = new \stdClass());
+        $this->assertSame($foo, $c->get('alias'), '->set() replaces an existing alias');
+    }
+
     public function testGet()
     {
         $sc = new ProjectServiceContainer();

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,10 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER)`
`200`	`200`	`$this->scopedServices[$scope][$id] = $service;`
`201`	`201`	`}`
`202`	`202`
	`203`	`+ if (isset($this->aliases[$id])) {`
	`204`	`+ unset($this->aliases[$id]);`
	`205`	`+ }`
	`206`	`+`
`203`	`207`	`$this->services[$id] = $service;`
`204`	`208`
`205`	`209`	`if (method_exists($this, $method = 'synchronize'.strtr($id, $this->underscoreMap).'Service')) {`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,14 @@ public function testSetAlsoSetsScopedService()`
`152`	`152`	`$this->assertSame($foo, $services['foo']['foo']);`
`153`	`153`	`}`
`154`	`154`
	`155`	`+ public function testSetReplacesAlias()`
	`156`	`+ {`
	`157`	`+ $c = new ProjectServiceContainer();`
	`158`	`+`
	`159`	`+ $c->set('alias', $foo = new \stdClass());`
	`160`	`+ $this->assertSame($foo, $c->get('alias'), '->set() replaces an existing alias');`
	`161`	`+ }`
	`162`	`+`
`155`	`163`	`public function testGet()`
`156`	`164`	`{`
`157`	`165`	`$sc = new ProjectServiceContainer();`