check instance of deprecatedAlias instead of string and add deprecations in changelog

damienfern · damienfern · commit c47b529fa0eb · 2025-01-20T15:45:24.000+01:00
diff --git a/src/Symfony/Component/Routing/Attribute/Route.php b/src/Symfony/Component/Routing/Attribute/Route.php
@@ -221,8 +221,6 @@ public function getAliases(): array
 
     /**
      * @param string|DeprecatedAlias|(string|DeprecatedAlias)[] $aliases
-     *
-     * @throws InvalidArgumentException if the "alias" argument is not a string or an array of strings
      */
     public function setAliases(string|DeprecatedAlias|array $aliases): void
     {
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 7.3
 ---
 
- * Allow aliases in `#[Route]` attribute
+ * Allow aliases and deprecations in `#[Route]` attribute
 
 7.2
 ---
diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Loader\LoaderResolverInterface;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Attribute\DeprecatedAlias;
 use Symfony\Component\Routing\Attribute\Route as RouteAttribute;
 use Symfony\Component\Routing\Exception\InvalidArgumentException;
 use Symfony\Component\Routing\Exception\LogicException;
@@ -241,17 +242,17 @@ protected function addRoute(RouteCollection $collection, object $attr, array $gl
                 $collection->add($name, $route, $priority);
             }
             foreach ($attr->getAliases() as $aliasAttribute) {
-                if (\is_string($aliasAttribute)) {
-                    $collection->addAlias($aliasAttribute, $name);
+                if ($aliasAttribute instanceof DeprecatedAlias) {
+                    $alias = $collection->addAlias($aliasAttribute->getAliasName(), $name);
+                    $alias->setDeprecated(
+                        $aliasAttribute->getPackage(),
+                        $aliasAttribute->getVersion(),
+                        $aliasAttribute->getMessage()
+                    );
                     continue;
                 }
 
-                $alias = $collection->addAlias($aliasAttribute->getAliasName(), $name);
-                $alias->setDeprecated(
-                    $aliasAttribute->getPackage(),
-                    $aliasAttribute->getVersion(),
-                    $aliasAttribute->getMessage()
-                );
+                $collection->addAlias($aliasAttribute, $name);
             }
         }
     }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DeprecatedAliasRouteController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DeprecatedAliasRouteController.php
@@ -16,7 +16,6 @@
 
 class DeprecatedAliasRouteController
 {
-
     #[Route('/path', name: 'action_with_deprecated_alias', alias: new DeprecatedAlias('my_other_alias_deprecated', 'MyBundleFixture', '1.0'))]
     public function action()
     {
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/MultipleDeprecatedAliasRouteController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/MultipleDeprecatedAliasRouteController.php
@@ -16,7 +16,6 @@
 
 class MultipleDeprecatedAliasRouteController
 {
-
     #[Route('/path', name: 'action_with_multiple_deprecated_alias', alias: [
         new DeprecatedAlias('my_first_alias_deprecated', 'MyFirstBundleFixture', '1.0'),
         new DeprecatedAlias('my_second_alias_deprecated', 'MySecondBundleFixture', '2.0'),

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,6 @@ public function getAliases(): array`
`221`	`221`
`222`	`222`	`/**`
`223`	`223`	`* @param string\|DeprecatedAlias\|(string\|DeprecatedAlias)[] $aliases`
`224`		`- *`
`225`		`- * @throws InvalidArgumentException if the "alias" argument is not a string or an array of strings`
`226`	`224`	`*/`
`227`	`225`	`public function setAliases(string\|DeprecatedAlias\|array $aliases): void`
`228`	`226`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`class DeprecatedAliasRouteController`
`18`	`18`	`{`
`19`		`-`
`20`	`19`	`#[Route('/path', name: 'action_with_deprecated_alias', alias: new DeprecatedAlias('my_other_alias_deprecated', 'MyBundleFixture', '1.0'))]`
`21`	`20`	`public function action()`
`22`	`21`	`{`