8000 bug #19870 [DI] Fix setting synthetic services on ContainerBuilder (n… · symfony/symfony@42b2641 · GitHub
[go: up one dir, main page]
Skip to content

Commit 42b2641

Browse files
fabpotfabpot
committed
bug #19870 [DI] Fix setting synthetic services on ContainerBuilder (nicolas-grekas)
This PR was merged into the 2.7 branch. Discussion ---------- [DI] Fix setting synthetic services on ContainerBuilder | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | Tests pass? | yes | Fixed tickets | #19858 | License | MIT `ContainerBuilder` doesn't allow setting a service while it's frozen and has no corresponding definition. Yet, the base `Container` doesn't have this limitation. See linked issue for some context. Commits ------- 42244f2 [DI] Fix setting synthetic services on ContainerBuilder
2 parents 0f6bc0b + 42244f2 commit 42b2641

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -362,21 +362,14 @@ public function getScopeChildren()
362362
public function set($id, $service, $scope = self::SCOPE_CONTAINER)
363363
{
364364
$id = strtolower($id);
365+
$set = isset($this->definitions[$id]);
365366

366-
if ($this->isFrozen()) {
367+
if ($this->isFrozen() && ($set || isset($this->obsoleteDefinitions[$id])) && !$this->{$set ? 'definitions' : 'obsoleteDefinitions'}[$id]->isSynthetic()) {
367368
// setting a synthetic service on a frozen container is alright
368-
if (
369-
(!isset($this->definitions[$id]) && !isset($this->obsoleteDefinitions[$id]))
370-
||
371-
(isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())
372-
||
373-
(isset($this->obsoleteDefinitions[$id]) && !$this->obsoleteDefinitions[$id]->isSynthetic())
374-
) {
375-
throw new BadMethodCallException(sprintf('Setting service "%s" on a frozen container is not allowed.', $id));
376-
}
369+
throw new BadMethodCallException(sprintf('Setting service "%s" on a frozen container is not allowed.', $id));
377370
}
378371

379-
if (isset($this->definitions[$id])) {
372+
if ($set) {
380373
$this->obsoleteDefinitions[$id] = $this->definitions[$id];
381374
}
382375

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -637,14 +637,12 @@ public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
637637
$container->set('a', new \stdClass());
638638
}
639639

640-
/**
641-
* @expectedException \BadMethodCallException
642-
*/
643640
public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()
644641
{
645642
$container = new ContainerBuilder();
646643
$container->compile();
647-
$container->set('a', new \stdClass());
644+
$container->set('a', $foo = new \stdClass());
645+
$this->assertSame($foo, $container->get('a'));
648646
}
649647

650648
public function testNoExceptionWhenSetSyntheticServiceOnAFrozenContainer()

‎src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public function testGetReturnsNullOnInactiveScope()
258258

259259
/**
260260
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
261-
* @expectedExcepionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.
261+
* @expectedExceptionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.
262262
*/
263263
public function testGetSyntheticServiceAlwaysThrows()
264264
{

0 commit comments

Comments
 (0)
0