bug #25364 [DependencyInjection] Prevent a loop in aliases within the findDefinition method (sroze)

fabpot · fabpot · commit 6e7e6847d9bf · 2017-12-07T08:06:29.000-08:00
This PR was merged into the 3.3 branch. Discussion ---------- [DependencyInjection] Prevent a loop in aliases within the `findDefinition` method | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25338 | License | MIT | Doc PR | ø This prevents an infinite loop going when aliases reference themselves. This is based on 3.3 as the "normalized ID" changed to allow non-lowercase names. Fixing this in 2.7 would mean a merge conflict that IMO is not worth it. Commits ------- 22f3523 Prevent a loop in aliases within the `findDefinition` method
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -993,8 +993,15 @@ public function findDefinition($id)
     {
         $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);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1044,6 +1044,22 @@ public function testInlinedDefinitions()
         $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();

Original file line number	Diff line number	Diff line change
`@@ -993,8 +993,15 @@ public function findDefinition($id)`
`993`	`993`	`{`
`994`	`994`	`$id = $this->normalizeId($id);`
`995`	`995`
	`996`	`+ $seen = array();`
`996`	`997`	`while (isset($this->aliasDefinitions[$id])) {`
`997`	`998`	`$id = (string) $this->aliasDefinitions[$id];`
	`999`	`+`
	`1000`	`+ if (isset($seen[$id])) {`
	`1001`	`+ throw new ServiceCircularReferenceException($id, array_keys($seen));`
	`1002`	`+ }`
	`1003`	`+`
	`1004`	`+ $seen[$id] = true;`
`998`	`1005`	`}`
`999`	`1006`
`1000`	`1007`	`return $this->getDefinition($id);`