diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] Fix circular-aliases message

Browse Source
This commit is contained in:
Nicolas Grekas 2017-12-07 18:06:18 +01:00
parent 6e7e6847d9
commit f1a7b075a6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -998,10 +998,14 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
$id = (string) $this->aliasDefinitions[$id]; $id = (string) $this->aliasDefinitions[$id];
if (isset($seen[$id])) { if (isset($seen[$id])) {
throw new ServiceCircularReferenceException($id, array_keys($seen)); $seen = array_values($seen);
$seen = array_slice($seen, array_search($id, $seen));
$seen[] = $id;
throw new ServiceCircularReferenceException($id, $seen);
} }
$seen[$id] = true; $seen[$id] = $id;
} }
return $this->getDefinition($id); return $this->getDefinition($id);

5
src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
View File

@ -1046,18 +1046,19 @@ class ContainerBuilderTest extends TestCase
/** /**
* @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
* @expectedExceptionMessage Circular reference detected for service "app.test_class", path: "app.test_class -> App\TestClass". * @expectedExceptionMessage Circular reference detected for service "app.test_class", path: "app.test_class -> App\TestClass -> app.test_class".
*/ */
public function testThrowsCircularExceptionForCircularAliases() public function testThrowsCircularExceptionForCircularAliases()
{ {
$builder = new ContainerBuilder(); $builder = new ContainerBuilder();
$builder->setAliases(array( $builder->setAliases(array(
'foo' => new Alias('app.test_class'),
'app.test_class' => new Alias('App\\TestClass'), 'app.test_class' => new Alias('App\\TestClass'),
'App\\TestClass' => new Alias('app.test_class'), 'App\\TestClass' => new Alias('app.test_class'),
)); ));
$builder->findDefinition('App\\TestClass'); $builder->findDefinition('foo');
} }
public function testInitializePropertiesBeforeMethodCalls() public function testInitializePropertiesBeforeMethodCalls()