Merge branch '5.4' into 6.0

* 5.4:
  More return type fixes (bis)
  Cleanup `@return` annotations

Author: nicolas-grekas

Generator/Dumper/GeneratorDumperInterface.php

@@ -31,7 +31,7 @@ public function dump(array $options = []);
     /**
      * Gets the routes to dump.
      *
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      */
     public function getRoutes();
 }

Loader/AnnotationClassLoader.php

@@ -102,7 +102,7 @@ public function setRouteAnnotationClass(string $class)
     /**
      * Loads from annotations from a class.
      *
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      *
      * @throws \InvalidArgumentException When route can't be parsed
      */

Loader/AnnotationDirectoryLoader.php

@@ -23,7 +23,7 @@
 class AnnotationDirectoryLoader extends AnnotationFileLoader
 {
     /**
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      *
      * @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed
      */

Loader/AnnotationFileLoader.php

@@ -40,7 +40,7 @@ public function __construct(FileLocatorInterface $locator, AnnotationClassLoader
     /**
      * Loads from annotations from a file.
      *
-     * @return RouteCollection|null A RouteCollection instance
+     * @return RouteCollection|null
      *
      * @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
      */

Loader/ClosureLoader.php

@@ -26,7 +26,7 @@ class ClosureLoader extends Loader
     /**
      * Loads a Closure.
      *
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      */
     public function load(mixed $closure, string $type = null)
     {

Loader/PhpFileLoader.php

@@ -30,7 +30,7 @@ class PhpFileLoader extends FileLoader
     /**
      * Loads a PHP file.
      *
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      */
     public function load(mixed $file, string $type = null)
     {

Loader/XmlFileLoader.php

@@ -35,7 +35,7 @@ class XmlFileLoader extends FileLoader
     public const SCHEME_PATH = '/schema/routing/routing-1.0.xsd';
 
     /**
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      *
      * @throws \InvalidArgumentException when the file cannot be loaded or when the XML cannot be
      *                                   parsed because it does not validate against the scheme

Loader/YamlFileLoader.php

@@ -39,7 +39,7 @@ class YamlFileLoader extends FileLoader
     private $yamlParser;
 
     /**
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      *
      * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid
      */

Matcher/Dumper/MatcherDumperInterface.php

@@ -31,7 +31,7 @@ public function dump(array $options = []);
     /**
      * Gets the routes to dump.
      *
-     * @return RouteCollection A RouteCollection instance
+     * @return RouteCollection
      */
     public function getRoutes();
 }

Matcher/ExpressionLanguageProvider.php

@@ -34,8 +34,10 @@ public function __construct(ServiceProviderInterface $functions)
      */
     public function getFunctions()
     {
+        $functions = [];
+
         foreach ($this->functions->getProvidedServices() as $function => $type) {
-            yield new ExpressionFunction(
+            $functions[] = new ExpressionFunction(
                 $function,
                 static function (...$args) use ($function) {
                     return sprintf('($context->getParameter(\'_functions\')->get(%s)(%s))', var_export($function, true), implode(', ', $args));
@@ -45,6 +47,8 @@ function ($values, ...$args) use ($function) {
                 }
             );
         }
+
+        return $functions;
     }
 
     public function get(string $function): callable