symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Lines changed: 4 additions & 11 deletions b/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Lines changed: 4 additions & 11 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
Lines changed: 2 additions & 4 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
Lines changed: 2 additions & 4 deletions
@@ -362,21 +362,14 @@ public function getScopeChildren()
     public function set($id, $service, $scope = self::SCOPE_CONTAINER)
     {
         $id = strtolower($id);
+        $set = isset($this->definitions[$id]);
 
-        if ($this->isFrozen()) {
+        if ($this->isFrozen() && ($set || isset($this->obsoleteDefinitions[$id])) && !$this->{$set ? 'definitions' : 'obsoleteDefinitions'}[$id]->isSynthetic()) {
             // setting a synthetic service on a frozen container is alright
-            if (
-                (!isset($this->definitions[$id]) && !isset($this->obsoleteDefinitions[$id]))
-                    ||
-                (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())
-                    ||
-                (isset($this->obsoleteDefinitions[$id]) && !$this->obsoleteDefinitions[$id]->isSynthetic())
-            ) {
-                throw new BadMethodCallException(sprintf('Setting service "%s" on a frozen container is not allowed.', $id));
-            }
+            throw new BadMethodCallException(sprintf('Setting service "%s" on a frozen container is not allowed.', $id));
         }
 
-        if (isset($this->definitions[$id])) {
+        if ($set) {
             $this->obsoleteDefinitions[$id] = $this->definitions[$id];
         }
 
 
@@ -637,14 +637,12 @@ public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
         $container->set('a', new \stdClass());
     }
 
-    /**
-     * @expectedException \BadMethodCallException
-     */
     public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()
     {
         $container = new ContainerBuilder();
         $container->compile();
-        $container->set('a', new \stdClass());
+        $container->set('a', $foo = new \stdClass());
+        $this->assertSame($foo, $container->get('a'));
     }
 
     public function testNoExceptionWhenSetSyntheticServiceOnAFrozenContainer()
Original file line number	Diff line number	Diff line change
`@@ -637,14 +637,12 @@ public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()`
`637`	`637`	`$container->set('a', new \stdClass());`
`638`	`638`	`}`
`639`	`639`
`640`		`- /**`
`641`		`- * @expectedException \BadMethodCallException`
`642`		`- */`
`643`	`640`	`public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()`
`644`	`641`	`{`
`645`	`642`	`$container = new ContainerBuilder();`
`646`	`643`	`$container->compile();`
`647`		`- $container->set('a', new \stdClass());`
	`644`	`+ $container->set('a', $foo = new \stdClass());`
	`645`	`+ $this->assertSame($foo, $container->get('a'));`
`648`	`646`	`}`
`649`	`647`
`650`	`648`	`public function testNoExceptionWhenSetSyntheticServiceOnAFrozenContainer()`