Fix aliasing logic

MatTheCat · MatTheCat · commit f9dba15a0202 · 2023-10-11T19:34:46.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Routing/LogoutRouteLoader.php b/src/Symfony/Bundle/SecurityBundle/Routing/LogoutRouteLoader.php
@@ -37,12 +37,11 @@ public function __invoke(): RouteCollection
             $routeName = '_logout_'.$firewallName;
 
             if (isset($routeNames[$logoutPath])) {
-                $collection->addAlias($routeNames[$logoutPath], $routeName);
+                $collection->addAlias($routeName, $routeNames[$logoutPath]);
             } else {
                 $routeNames[$logoutPath] = $routeName;
+                $collection->add($routeName, new Route($logoutPath));
             }
-
-            $collection->add($routeName, new Route($logoutPath));
         }
 
         return $collection;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Routing/LogoutRouteLoaderTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Routing/LogoutRouteLoaderTest.php
@@ -33,7 +33,7 @@ public function testLoad()
         self::assertCount(1, $collection);
         self::assertEquals(new Route('/logout'), $collection->get('_logout_main'));
         self::assertCount(1, $collection->getAliases());
-        self::assertEquals('_logout_admin', $collection->getAlias('_logout_main')->getId());
+        self::assertEquals('_logout_main', $collection->getAlias('_logout_admin')->getId());
 
         $resources = $collection->getResources();
         self::assertCount(1, $resources);

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,11 @@ public function __invoke(): RouteCollection`
`37`	`37`	`$routeName = '_logout_'.$firewallName;`
`38`	`38`
`39`	`39`	`if (isset($routeNames[$logoutPath])) {`
`40`		`- $collection->addAlias($routeNames[$logoutPath], $routeName);`
	`40`	`+ $collection->addAlias($routeName, $routeNames[$logoutPath]);`
`41`	`41`	`} else {`
`42`	`42`	`$routeNames[$logoutPath] = $routeName;`
	`43`	`+ $collection->add($routeName, new Route($logoutPath));`
`43`	`44`	`}`
`44`		`-`
`45`		`- $collection->add($routeName, new Route($logoutPath));`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`return $collection;`