Skip to content

Commit 63e6368

Browse files
committed
merged branch jakzal/master-fixme (PR symfony#8480)
This PR was merged into the master branch. Discussion ---------- [DependencyInjection] Removed outdated FIXME comments. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - I stumbled upon two FIXME comments in the `ContainerBulderTest` which were introduced in 7796eb2. It looks like the intention was that parameters in the builder should be resolved without having to compile the container. Unless we agree to change the behaviour at this point (the change was introduced over 3 years ago), the comments should be removed. Commits ------- 44f9322 [DependencyInjection] Removed outdated FIXME comments.
2 parents 2e650b1 + 44f9322 commit 63e6368

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,15 +403,13 @@ public function testMerge()
403403
$container->setResourceTracking(false);
404404
$config = new ContainerBuilder(new ParameterBag(array('foo' => '%bar%')));
405405
$container->merge($config);
406-
////// FIXME
407406
$container->compile();
408407
$this->assertEquals(array('bar' => 'foo', 'foo' => 'foo'), $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
409408

410409
$container = new ContainerBuilder(new ParameterBag(array('bar' => 'foo')));
411410
$container->setResourceTracking(false);
412411
$config = new ContainerBuilder(new ParameterBag(array('foo' => '%bar%', 'baz' => '%foo%')));
413412
$container->merge($config);
414-
////// FIXME
415413
$container->compile();
416414
$this->assertEquals(array('bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'), $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
417415

0 commit comments

Comments
 (0)