Merge branch '5.4' into 6.3

derrabus · derrabus · commit fcb11c799ec1 · 2023-11-30T11:31:36.000+01:00
* 5.4:
  [Routing] Fix removing aliases pointing to removed route in RouteCollection::remove()
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -147,8 +147,15 @@ public function get(string $name): ?Route
      */
     public function remove(string|array $name)
     {
-        foreach ((array) $name as $n) {
-            unset($this->routes[$n], $this->priorities[$n], $this->aliases[$n]);
+        $names = (array) $name;
+        foreach ($names as $n) {
+            unset($this->routes[$n], $this->priorities[$n]);
+        }
+
+        foreach ($this->aliases as $k => $alias) {
+            if (\in_array($alias->getId(), $names, true)) {
+                unset($this->aliases[$k]);
+            }
         }
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
@@ -225,11 +225,13 @@ public function testRemove()
         $collection1->add('bar', $bar = new Route('/bar'));
         $collection->addCollection($collection1);
         $collection->add('last', $last = new Route('/last'));
+        $collection->addAlias('ccc_my_custom_alias', 'foo');
 
         $collection->remove('foo');
         $this->assertSame(['bar' => $bar, 'last' => $last], $collection->all(), '->remove() can remove a single route');
         $collection->remove(['bar', 'last']);
         $this->assertSame([], $collection->all(), '->remove() accepts an array and can remove multiple routes at once');
+        $this->assertNull($collection->getAlias('ccc_my_custom_alias'));
     }
 
     public function testSetHost()

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,15 @@ public function get(string $name): ?Route`
`147`	`147`	`*/`
`148`	`148`	`public function remove(string\|array $name)`
`149`	`149`	`{`
`150`		`- foreach ((array) $name as $n) {`
`151`		`- unset($this->routes[$n], $this->priorities[$n], $this->aliases[$n]);`
	`150`	`+ $names = (array) $name;`
	`151`	`+ foreach ($names as $n) {`
	`152`	`+ unset($this->routes[$n], $this->priorities[$n]);`
	`153`	`+ }`
	`154`	`+`
	`155`	`+ foreach ($this->aliases as $k => $alias) {`
	`156`	`+ if (\in_array($alias->getId(), $names, true)) {`
	`157`	`+ unset($this->aliases[$k]);`
	`158`	`+ }`
`152`	`159`	`}`
`153`	`160`	`}`
`154`	`161`