feature #60862 [Routing] Remove deprecated AttributeClassLoader property and setter (mttsch)

fabpot · fabpot · commit 9c813d246339 · 2025-06-22T09:13:25.000+02:00
This PR was merged into the 8.0 branch. Discussion ---------- [Routing] Remove deprecated AttributeClassLoader property and setter | Q | A | ------------- | --- | Branch? | 8.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT  Commits ------- 451ddc2 [Routing] Remove deprecated AttributeClassLoader property and setter
diff --git a/UPGRADE-8.0.md b/UPGRADE-8.0.md
@@ -299,6 +299,7 @@ Routing
 -------
 
  * Providing a non-array `_query` parameter to `UrlGenerator` causes an `InvalidParameterException`
+ * Remove the protected `AttributeClassLoader::$routeAnnotationClass` property and the `setRouteAnnotationClass()` method, use `AttributeClassLoader::setRouteAttributeClass()` instead
 
 Security
 --------
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Providing a non-array `_query` parameter to `UrlGenerator` causes an `InvalidParameterException`
+ * Remove the protected `AttributeClassLoader::$routeAnnotationClass` property and the `setRouteAnnotationClass()` method, use `AttributeClassLoader::setRouteAttributeClass()` instead
 
 7.4
 ---
diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
@@ -55,10 +55,6 @@
  */
 abstract class AttributeClassLoader implements LoaderInterface
 {
-    /**
-     * @deprecated since Symfony 7.2, use "setRouteAttributeClass()" instead.
-     */
-    protected string $routeAnnotationClass = RouteAttribute::class;
     private string $routeAttributeClass = RouteAttribute::class;
     protected int $defaultRouteIndex = 0;
 
@@ -67,24 +63,11 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @deprecated since Symfony 7.2, use "setRouteAttributeClass(string $class)" instead
-     *
-     * Sets the annotation class to read route properties from.
-     */
-    public function setRouteAnnotationClass(string $class): void
-    {
-        trigger_deprecation('symfony/routing', '7.2', 'The "%s()" method is deprecated, use "%s::setRouteAttributeClass()" instead.', __METHOD__, self::class);
-
-        $this->setRouteAttributeClass($class);
-    }
-
     /**
      * Sets the attribute class to read route properties from.
      */
     public function setRouteAttributeClass(string $class): void
     {
-        $this->routeAnnotationClass = $class;
         $this->routeAttributeClass = $class;
     }
 
@@ -293,8 +276,7 @@ protected function getGlobals(\ReflectionClass $class): array
     {
         $globals = $this->resetGlobals();
 
-        // to be replaced in Symfony 8.0 by $this->routeAttributeClass
-        if ($attribute = $class->getAttributes($this->routeAnnotationClass, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null) {
+        if ($attribute = $class->getAttributes($this->routeAttributeClass, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null) {
             $attr = $attribute->newInstance();
 
             if (null !== $attr->getName()) {
@@ -381,8 +363,7 @@ abstract protected function configureRoute(Route $route, \ReflectionClass $class
      */
     private function getAttributes(\ReflectionClass|\ReflectionMethod $reflection): iterable
     {
-        // to be replaced in Symfony 8.0 by $this->routeAttributeClass
-        foreach ($reflection->getAttributes($this->routeAnnotationClass, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
+        foreach ($reflection->getAttributes($this->routeAttributeClass, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
             yield $attribute->newInstance();
         }
     }
