Merge branch '6.4' into 7.0

* 6.4:
  [Serializer] Replace "annotation" wording by "attribute"

Author: nicolas-grekas

Loader/AttributeClassLoader.php

@@ -69,8 +69,6 @@ public function setRouteAnnotationClass(string $class): void
     }
 
     /**
-     * Loads from annotations from a class.
-     *
      * @throws \InvalidArgumentException When route can't be parsed
      */
     public function load(mixed $class, string $type = null): RouteCollection
@@ -81,7 +79,7 @@ public function load(mixed $class, string $type = null): RouteCollection
 
         $class = new \ReflectionClass($class);
         if ($class->isAbstract()) {
-            throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class->getName()));
+            throw new \InvalidArgumentException(sprintf('Attributes from class "%s" cannot be read as it is abstract.', $class->getName()));
         }
 
         $globals = $this->getGlobals($class);

Loader/AttributeFileLoader.php

@@ -30,7 +30,7 @@ class AttributeFileLoader extends FileLoader
     public function __construct(FileLocatorInterface $locator, AttributeClassLoader $loader)
     {
         if (!\function_exists('token_get_all')) {
-            throw new \LogicException('The Tokenizer extension is required for the routing annotation loaders.');
+            throw new \LogicException('The Tokenizer extension is required for the routing attribute loader.');
         }
 
         parent::__construct($locator);
@@ -39,7 +39,7 @@ public function __construct(FileLocatorInterface $locator, AttributeClassLoader
     }
 
     /**
-     * Loads from annotations from a file.
+     * Loads from attributes from a file.
      *
      * @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
      */