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

Prevent a loop in aliases within the `findDefinition` method

This commit is contained in:
Samuel ROZE 2017-12-06 16:27:14 +00:00
parent b783602622
commit 22f35239a4
No known key found for this signature in database
GPG Key ID: 835426F55A19FB84
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -993,8 +993,15 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
{
$id = $this->normalizeId($id);
$seen = array();
while (isset($this->aliasDefinitions[$id])) {
$id = (string) $this->aliasDefinitions[$id];
if (isset($seen[$id])) {
throw new ServiceCircularReferenceException($id, array_keys($seen));
}
$seen[$id] = true;
}
return $this->getDefinition($id);

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

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