Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface

Author: nicolas-grekas

CompiledRoute.php

@@ -93,8 +93,6 @@ final public function unserialize(string $serialized)
 
     /**
      * Returns the static prefix.
-     *
-     * @return string The static prefix
      */
     public function getStaticPrefix(): string
     {
@@ -103,8 +101,6 @@ public function getStaticPrefix(): string
 
     /**
      * Returns the regex.
-     *
-     * @return string The regex
      */
     public function getRegex(): string
     {
@@ -113,8 +109,6 @@ public function getRegex(): string
 
     /**
      * Returns the host regex.
-     *
-     * @return string|null The host regex or null
      */
     public function getHostRegex(): ?string
     {
@@ -123,8 +117,6 @@ public function getHostRegex(): ?string
 
     /**
      * Returns the tokens.
-     *
-     * @return array The tokens
      */
     public function getTokens(): array
     {
@@ -133,8 +125,6 @@ public function getTokens(): array
 
     /**
      * Returns the host tokens.
-     *
-     * @return array The tokens
      */
     public function getHostTokens(): array
     {
@@ -143,8 +133,6 @@ public function getHostTokens(): array
 
     /**
      * Returns the variables.
-     *
-     * @return array The variables
      */
     public function getVariables(): array
     {
@@ -153,8 +141,6 @@ public function getVariables(): array
 
     /**
      * Returns the path variables.
-     *
-     * @return array The variables
      */
     public function getPathVariables(): array
     {
@@ -163,8 +149,6 @@ public function getPathVariables(): array
 
     /**
      * Returns the host variables.
-     *
-     * @return array The variables
      */
     public function getHostVariables(): array
     {

Generator/Dumper/GeneratorDumperInterface.php

@@ -23,8 +23,6 @@ interface GeneratorDumperInterface
     /**
      * Dumps a set of routes to a string representation of executable code
      * that can then be used to generate a URL of such a route.
-     *
-     * @return string Executable code
      */
     public function dump(array $options = []): string;
 

Generator/UrlGenerator.php

@@ -329,8 +329,6 @@ protected function doGenerate(array $variables, array $defaults, array $requirem
      *
      * @param string $basePath   The base path
      * @param string $targetPath The target path
-     *
-     * @return string The relative target path
      */
     public static function getRelativePath(string $basePath, string $targetPath): string
     {

Generator/UrlGeneratorInterface.php

@@ -71,8 +71,6 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
      *
      * The special parameter _fragment will be used as the document fragment suffixed to the final URL.
      *
-     * @return string The generated URL
-     *
      * @throws RouteNotFoundException              If the named route doesn't exist
      * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
      * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because

Loader/AnnotationFileLoader.php

@@ -72,8 +72,6 @@ public function supports(mixed $resource, string $type = null): bool
 
     /**
      * Returns the full class name for the first class in the file.
-     *
-     * @return string|false Full class name if found, false otherwise
      */
     protected function findClass(string $file): string|false
     {

Matcher/Dumper/MatcherDumperInterface.php

@@ -23,8 +23,6 @@ interface MatcherDumperInterface
     /**
      * Dumps a set of routes to a string representation of executable code
      * that can then be used to match a request against these routes.
-     *
-     * @return string Executable code
      */
     public function dump(array $options = []): string;
 

Matcher/RedirectableUrlMatcherInterface.php

@@ -19,13 +19,11 @@
 interface RedirectableUrlMatcherInterface
 {
     /**
-     * Redirects the user to another URL.
+     * Redirects the user to another URL and returns the parameters for the redirection.
      *
      * @param string      $path   The path info to redirect to
      * @param string      $route  The route name that matched
      * @param string|null $scheme The URL scheme (null to keep the current one)
-     *
-     * @return array An array of parameters
      */
     public function redirect(string $path, string $route, string $scheme = null): array;
 }

Matcher/RequestMatcherInterface.php

@@ -29,8 +29,6 @@ interface RequestMatcherInterface
      * If the matcher can not find information, it must throw one of the exceptions documented
      * below.
      *
-     * @return array An array of parameters
-     *
      * @throws NoConfigurationException  If no routing configuration could be found
      * @throws ResourceNotFoundException If no matching resource could be found
      * @throws MethodNotAllowedException If a matching resource was found but the request method is not allowed

Matcher/UrlMatcher.php

@@ -120,8 +120,6 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac
      *
      * @param string $pathinfo The path info to be parsed
      *
-     * @return array An array of parameters
-     *
      * @throws NoConfigurationException  If no routing configuration could be found
      * @throws ResourceNotFoundException If the resource could not be found
      * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
@@ -204,8 +202,6 @@ protected function matchCollection(string $pathinfo, RouteCollection $routes): a
      * As this method requires the Route object, it is not available
      * in matchers that do not have access to the matched Route instance
      * (like the PHP and Apache matcher dumpers).
-     *
-     * @return array An array of parameters
      */
     protected function getAttributes(Route $route, string $name, array $attributes): array
     {
@@ -236,8 +232,6 @@ protected function handleRouteRequirements(string $pathinfo, string $name, Route
 
     /**
      * Get merged default parameters.
-     *
-     * @return array Merged default parameters
      */
     protected function mergeDefaults(array $params, array $defaults): array
     {

Matcher/UrlMatcherInterface.php

@@ -31,8 +31,6 @@ interface UrlMatcherInterface extends RequestContextAwareInterface
      *
      * @param string $pathinfo The path info to be parsed (raw format, i.e. not urldecoded)
      *
-     * @return array An array of parameters
-     *
      * @throws NoConfigurationException  If no routing configuration could be found
      * @throws ResourceNotFoundException If the resource could not be found
      * @throws MethodNotAllowedException If the resource was found but the request method is not allowed