Allow symfony 6 and add requirement typehints

acrobat · acrobat · commit fdd2aaf88b8a · 2021-12-20T16:14:19.000+01:00
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -31,7 +31,10 @@ jobs:
                       symfony-require: "5.0.*"
 
                     - php-version: "8.0"
-                      symfony-require: "*"
+                      symfony-require: "5.0.*"
+
+                    - php-version: "8.0"
+                      symfony-require: "6.0.*"
 
         steps:
             - name: "Checkout project"
diff --git a/composer.json b/composer.json
@@ -16,15 +16,15 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "symfony/routing": "^4.4 || ^5.0",
-        "symfony/http-kernel": "^4.4 || ^5.0",
+        "symfony/routing": "^4.4 || ^5.0 || ^6.0",
+        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^5.0",
-        "symfony/dependency-injection": "^4.4 || ^5.0",
-        "symfony/config": "^4.4 || ^5.0",
-        "symfony/event-dispatcher": "^4.4 || ^5.0",
+        "symfony/phpunit-bridge": "^5.4 || ^6.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
+        "symfony/config": "^4.4 || ^5.0 || ^6.0",
+        "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0",
         "symfony-cmf/testing": "^3@dev"
     },
     "suggest": {
diff --git a/src/ChainRouteCollection.php b/src/ChainRouteCollection.php
@@ -43,17 +43,15 @@ public function __clone()
      *
      * @return \ArrayIterator An \ArrayIterator object for iterating over routes
      */
-    public function getIterator()
+    public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->all());
     }
 
     /**
      * Gets the number of Routes in this collection.
-     *
-     * @return int The number of routes
      */
-    public function count()
+    public function count(): int
     {
         $count = 0;
         foreach ($this->routeCollections as $routeCollection) {
@@ -81,7 +79,7 @@ public function add($name, Route $route, int $priority = 0)
      *
      * @return Route[] An array of routes
      */
-    public function all()
+    public function all(): array
     {
         $routeCollectionAll = new RouteCollection();
         foreach ($this->routeCollections as $routeCollection) {
@@ -95,17 +93,17 @@ public function all()
      * Gets a route by name.
      *
      * @param string $name The route name
-     *
-     * @return Route|null A Route instance or null when not found
      */
-    public function get($name)
+    public function get($name): ?Route
     {
         foreach ($this->routeCollections as $routeCollection) {
             $route = $routeCollection->get($name);
             if (null !== $route) {
                 return $route;
             }
         }
+
+        return null;
     }
 
     /**
@@ -240,7 +238,7 @@ public function setMethods($methods)
      *
      * @return ResourceInterface[] An array of resources
      */
-    public function getResources()
+    public function getResources(): array
     {
         if (0 === count($this->routeCollections)) {
             return [];
diff --git a/src/ChainRouter.php b/src/ChainRouter.php
@@ -70,7 +70,7 @@ public function __construct(LoggerInterface $logger = null)
     /**
      * @return RequestContext
      */
-    public function getContext()
+    public function getContext(): RequestContext
     {
         if (!$this->context) {
             $this->context = new RequestContext();
@@ -143,7 +143,7 @@ protected function sortRouters()
      *
      * Note: You should use matchRequest if you can.
      */
-    public function match($pathinfo)
+    public function match($pathinfo): array
     {
         return $this->doMatch($pathinfo);
     }
@@ -153,7 +153,7 @@ public function match($pathinfo)
      *
      * Loops through all routes and tries to match the passed request.
      */
-    public function matchRequest(Request $request)
+    public function matchRequest(Request $request): array
     {
         return $this->doMatch($request->getPathInfo(), $request);
     }
@@ -213,7 +213,7 @@ private function doMatch($pathinfo, Request $request = null)
     /**
      * {@inheritdoc}
      *
-     * @param mixed $name
+     * @param string $name
      *
      * The CMF routing system used to allow to pass route objects as $name to generate the route.
      * Since Symfony 5.0, the UrlGeneratorInterface declares $name as string. We widen the contract
@@ -224,7 +224,7 @@ private function doMatch($pathinfo, Request $request = null)
      * Loops through all registered routers and returns a router if one is found.
      * It will always return the first route generated.
      */
-    public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH)
+    public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH): string
     {
         if (is_object($name)) {
             @trigger_error('Passing an object as route name is deprecated since version 2.3. Pass the `RouteObjectInterface::OBJECT_BASED_ROUTE_NAME` as route name and the object in the parameters with key `RouteObjectInterface::ROUTE_OBJECT`.', E_USER_DEPRECATED);
diff --git a/src/ContentAwareGenerator.php b/src/ContentAwareGenerator.php
@@ -71,7 +71,7 @@ public function setContentRepository(ContentRepositoryInterface $contentReposito
      *
      * @throws RouteNotFoundException If there is no such route in the database
      */
-    public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH)
+    public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH): string
     {
         if ($name instanceof SymfonyRoute) {
             @trigger_error('Passing an object as route name is deprecated since version 2.3. Pass the `RouteObjectInterface::OBJECT_BASED_ROUTE_NAME` as route name and the object in the parameters with key `RouteObjectInterface::ROUTE_OBJECT` resp the content id with content_id.', E_USER_DEPRECATED);
diff --git a/src/DynamicRouter.php b/src/DynamicRouter.php
@@ -159,11 +159,11 @@ public function getGenerator()
      * Instead, Pass the RouteObjectInterface::OBJECT_BASED_ROUTE_NAME as route name and the object
      * in the parameters with key RouteObjectInterface::ROUTE_OBJECT.
      *
-     * @param string|Route $name The name of the route or the Route instance
+     * @param string $name The name of the route
      *
      * @throws RouteNotFoundException if route doesn't exist
      */
-    public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
+    public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH): string
     {
         if (is_object($name)) {
             @trigger_error('Passing an object as route name is deprecated since version 2.3. Pass the `RouteObjectInterface::OBJECT_BASED_ROUTE_NAME` as route name and the object in the parameters with key `RouteObjectInterface::ROUTE_OBJECT', E_USER_DEPRECATED);
@@ -213,7 +213,7 @@ public function supports($name)
      *
      * @api
      */
-    public function match($pathinfo)
+    public function match($pathinfo): array
     {
         @trigger_error(__METHOD__.'() is deprecated since version 1.3 and will be removed in 2.0. Use matchRequest() instead.', E_USER_DEPRECATED);
 
@@ -252,7 +252,7 @@ public function match($pathinfo)
      * @throws MethodNotAllowedException If a matching resource was found but
      *                                   the request method is not allowed
      */
-    public function matchRequest(Request $request)
+    public function matchRequest(Request $request): array
     {
         if ($this->eventDispatcher) {
             $event = new RouterMatchEvent($request);
@@ -294,7 +294,7 @@ public function setContext(RequestContext $context)
      *
      * @api
      */
-    public function getContext()
+    public function getContext(): RequestContext
     {
         return $this->context;
     }
diff --git a/src/LazyRouteCollection.php b/src/LazyRouteCollection.php
@@ -32,17 +32,15 @@ public function __construct(RouteProviderInterface $provider)
     /**
      * {@inheritdoc}
      */
-    public function getIterator()
+    public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->all());
     }
 
     /**
      * Gets the number of Routes in this collection.
-     *
-     * @return int The number of routes
      */
-    public function count()
+    public function count(): int
     {
         return count($this->all());
     }
@@ -52,7 +50,7 @@ public function count()
      *
      * @return Route[] An array of routes
      */
-    public function all()
+    public function all(): array
     {
         return $this->provider->getRoutesByNames(null);
     }
@@ -61,15 +59,13 @@ public function all()
      * Gets a route by name.
      *
      * @param string $name The route name
-     *
-     * @return Route|null A Route instance or null when not found
      */
-    public function get($name)
+    public function get($name): ?Route
     {
         try {
             return $this->provider->getRouteByName($name);
         } catch (RouteNotFoundException $e) {
-            return;
+            return null;
         }
     }
 }
diff --git a/src/NestedMatcher/NestedMatcher.php b/src/NestedMatcher/NestedMatcher.php
@@ -135,7 +135,7 @@ public function setFinalMatcher(FinalMatcherInterface $final)
     /**
      * {@inheritdoc}
      */
-    public function matchRequest(Request $request)
+    public function matchRequest(Request $request): array
     {
         $collection = $this->routeProvider->getRouteCollectionForRequest($request);
         if (!count($collection)) {
diff --git a/src/NestedMatcher/UrlMatcher.php b/src/NestedMatcher/UrlMatcher.php
@@ -43,7 +43,7 @@ public function finalMatch(RouteCollection $collection, Request $request)
     /**
      * {@inheritdoc}
      */
-    protected function getAttributes(Route $route, $name, array $attributes)
+    protected function getAttributes(Route $route, $name, array $attributes): array
     {
         if ($route instanceof RouteObjectInterface && is_string($route->getRouteKey())) {
             $name = $route->getRouteKey();
diff --git a/src/PagedRouteCollection.php b/src/PagedRouteCollection.php
@@ -69,8 +69,9 @@ protected function loadNextElements($offset)
     }
 
     /**
-     * {@inheritdoc}
+     * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->currentRoutes);
@@ -79,7 +80,7 @@ public function current()
     /**
      * {@inheritdoc}
      */
-    public function next()
+    public function next(): void
     {
         $result = next($this->currentRoutes);
         if (false === $result) {
@@ -89,8 +90,9 @@ public function next()
     }
 
     /**
-     * {@inheritdoc}
+     * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->currentRoutes);
@@ -99,15 +101,15 @@ public function key()
     /**
      * {@inheritdoc}
      */
-    public function valid()
+    public function valid(): bool
     {
-        return key($this->currentRoutes);
+        return null !== key($this->currentRoutes);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function rewind()
+    public function rewind(): void
     {
         $this->current = 0;
         $this->currentRoutes = null;
diff --git a/src/ProviderBasedGenerator.php b/src/ProviderBasedGenerator.php
@@ -52,7 +52,7 @@ public function __construct(RouteProviderInterface $provider, LoggerInterface $l
      *
      * @param mixed $name
      */
-    public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)
+    public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH): string
     {
         if (is_object($name)) {
             @trigger_error('Passing an object as route name is deprecated since version 2.3. Pass the `RouteObjectInterface::OBJECT_BASED_ROUTE_NAME` as route name and the object in the parameters with key `RouteObjectInterface::ROUTE_OBJECT`', E_USER_DEPRECATED);
diff --git a/tests/Unit/Routing/ContentAwareGeneratorTest.php b/tests/Unit/Routing/ContentAwareGeneratorTest.php
@@ -559,7 +559,7 @@ public function testGetRouteDebugMessageLegacy(): void
  */
 class TestableContentAwareGenerator extends ContentAwareGenerator
 {
-    protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = [])
+    protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = []): string
     {
         return 'result_url';
     }
diff --git a/tests/Unit/Routing/ProviderBasedGeneratorTest.php b/tests/Unit/Routing/ProviderBasedGeneratorTest.php
@@ -180,7 +180,7 @@ public function testGenerateByRoute(): void
  */
 class TestableProviderBasedGenerator extends ProviderBasedGenerator
 {
-    protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = [])
+    protected function doGenerate(array $variables, array $defaults, array $requirements, array $tokens, array $parameters, string $name, int $referenceType, array $hostTokens, array $requiredSchemes = []): string
     {
         $url = 'result_url';
         if ($parameters && $query = http_build_query($parameters, '', '&', PHP_QUERY_RFC3986)) {
diff --git a/tests/Unit/Routing/RouteMock.php b/tests/Unit/Routing/RouteMock.php
@@ -28,7 +28,7 @@ public function getContent()
         return;
     }
 
-    public function getDefaults()
+    public function getDefaults(): array
     {
         $defaults = [];
         if (null !== $this->locale) {
@@ -38,7 +38,7 @@ public function getDefaults()
         return $defaults;
     }
 
-    public function getRequirement($key)
+    public function getRequirement($key): ?string
     {
         if ('_locale' !== $key) {
             throw new \Exception();

Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,15 @@ public function __clone()`
`43`	`43`	`*`
`44`	`44`	`* @return \ArrayIterator An \ArrayIterator object for iterating over routes`
`45`	`45`	`*/`
`46`		`- public function getIterator()`
	`46`	`+ public function getIterator(): \ArrayIterator`
`47`	`47`	`{`
`48`	`48`	`return new \ArrayIterator($this->all());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`	`52`	`* Gets the number of Routes in this collection.`
`53`		`- *`
`54`		`- * @return int The number of routes`
`55`	`53`	`*/`
`56`		`- public function count()`
	`54`	`+ public function count(): int`
`57`	`55`	`{`
`58`	`56`	`$count = 0;`
`59`	`57`	`foreach ($this->routeCollections as $routeCollection) {`
`@@ -81,7 +79,7 @@ public function add($name, Route $route, int $priority = 0)`
`81`	`79`	`*`
`82`	`80`	`* @return Route[] An array of routes`
`83`	`81`	`*/`
`84`		`- public function all()`
	`82`	`+ public function all(): array`
`85`	`83`	`{`
`86`	`84`	`$routeCollectionAll = new RouteCollection();`
`87`	`85`	`foreach ($this->routeCollections as $routeCollection) {`
`@@ -95,17 +93,17 @@ public function all()`
`95`	`93`	`* Gets a route by name.`
`96`	`94`	`*`
`97`	`95`	`* @param string $name The route name`
`98`		`- *`
`99`		`- * @return Route\|null A Route instance or null when not found`
`100`	`96`	`*/`
`101`		`- public function get($name)`
	`97`	`+ public function get($name): ?Route`
`102`	`98`	`{`
`103`	`99`	`foreach ($this->routeCollections as $routeCollection) {`
`104`	`100`	`$route = $routeCollection->get($name);`
`105`	`101`	`if (null !== $route) {`
`106`	`102`	`return $route;`
`107`	`103`	`}`
`108`	`104`	`}`
	`105`	`+`
	`106`	`+ return null;`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`/**`
`@@ -240,7 +238,7 @@ public function setMethods($methods)`
`240`	`238`	`*`
`241`	`239`	`* @return ResourceInterface[] An array of resources`
`242`	`240`	`*/`
`243`		`- public function getResources()`
	`241`	`+ public function getResources(): array`
`244`	`242`	`{`
`245`	`243`	`if (0 === count($this->routeCollections)) {`
`246`	`244`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function __construct(LoggerInterface $logger = null)`
`70`	`70`	`/**`
`71`	`71`	`* @return RequestContext`
`72`	`72`	`*/`
`73`		`- public function getContext()`
	`73`	`+ public function getContext(): RequestContext`
`74`	`74`	`{`
`75`	`75`	`if (!$this->context) {`
`76`	`76`	`$this->context = new RequestContext();`
`@@ -143,7 +143,7 @@ protected function sortRouters()`
`143`	`143`	`*`
`144`	`144`	`* Note: You should use matchRequest if you can.`
`145`	`145`	`*/`
`146`		`- public function match($pathinfo)`
	`146`	`+ public function match($pathinfo): array`
`147`	`147`	`{`
`148`	`148`	`return $this->doMatch($pathinfo);`
`149`	`149`	`}`
`@@ -153,7 +153,7 @@ public function match($pathinfo)`
`153`	`153`	`*`
`154`	`154`	`* Loops through all routes and tries to match the passed request.`
`155`	`155`	`*/`
`156`		`- public function matchRequest(Request $request)`
	`156`	`+ public function matchRequest(Request $request): array`
`157`	`157`	`{`
`158`	`158`	`return $this->doMatch($request->getPathInfo(), $request);`
`159`	`159`	`}`
`@@ -213,7 +213,7 @@ private function doMatch($pathinfo, Request $request = null)`
`213`	`213`	`/**`
`214`	`214`	`* {@inheritdoc}`
`215`	`215`	`*`
`216`		`- * @param mixed $name`
	`216`	`+ * @param string $name`
`217`	`217`	`*`
`218`	`218`	`* The CMF routing system used to allow to pass route objects as $name to generate the route.`
`219`	`219`	`* Since Symfony 5.0, the UrlGeneratorInterface declares $name as string. We widen the contract`
`@@ -224,7 +224,7 @@ private function doMatch($pathinfo, Request $request = null)`
`224`	`224`	`* Loops through all registered routers and returns a router if one is found.`
`225`	`225`	`* It will always return the first route generated.`
`226`	`226`	`*/`
`227`		`- public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH)`
	`227`	`+ public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH): string`
`228`	`228`	`{`
`229`	`229`	`if (is_object($name)) {`
`230`	`230`	@trigger_error('Passing an object as route name is deprecated since version 2.3. Pass the `RouteObjectInterface::OBJECT_BASED_ROUTE_NAME` as route name and the object in the parameters with key `RouteObjectInterface::ROUTE_OBJECT`.', E_USER_DEPRECATED);
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function setContentRepository(ContentRepositoryInterface $contentReposito`
`71`	`71`	`*`
`72`	`72`	`* @throws RouteNotFoundException If there is no such route in the database`
`73`	`73`	`*/`
`74`		`- public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH)`
	`74`	`+ public function generate($name, $parameters = [], $absolute = UrlGeneratorInterface::ABSOLUTE_PATH): string`
`75`	`75`	`{`
`76`	`76`	`if ($name instanceof SymfonyRoute) {`
`77`	`77`	@trigger_error('Passing an object as route name is deprecated since version 2.3. Pass the `RouteObjectInterface::OBJECT_BASED_ROUTE_NAME` as route name and the object in the parameters with key `RouteObjectInterface::ROUTE_OBJECT` resp the content id with content_id.', E_USER_DEPRECATED);
Original file line number	Diff line number	Diff line change
`@@ -159,11 +159,11 @@ public function getGenerator()`
`159`	`159`	`* Instead, Pass the RouteObjectInterface::OBJECT_BASED_ROUTE_NAME as route name and the object`
`160`	`160`	`* in the parameters with key RouteObjectInterface::ROUTE_OBJECT.`
`161`	`161`	`*`
`162`		`- * @param string\|Route $name The name of the route or the Route instance`
	`162`	`+ * @param string $name The name of the route`
`163`	`163`	`*`
`164`	`164`	`* @throws RouteNotFoundException if route doesn't exist`
`165`	`165`	`*/`
`166`		`- public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)`
	`166`	`+ public function generate($name, $parameters = [], $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH): string`
`167`	`167`	`{`
`168`	`168`	`if (is_object($name)) {`
`169`	`169`	@trigger_error('Passing an object as route name is deprecated since version 2.3. Pass the `RouteObjectInterface::OBJECT_BASED_ROUTE_NAME` as route name and the object in the parameters with key `RouteObjectInterface::ROUTE_OBJECT', E_USER_DEPRECATED);
`@@ -213,7 +213,7 @@ public function supports($name)`
`213`	`213`	`*`
`214`	`214`	`* @api`
`215`	`215`	`*/`
`216`		`- public function match($pathinfo)`
	`216`	`+ public function match($pathinfo): array`
`217`	`217`	`{`
`218`	`218`	`@trigger_error(__METHOD__.'() is deprecated since version 1.3 and will be removed in 2.0. Use matchRequest() instead.', E_USER_DEPRECATED);`
`219`	`219`
`@@ -252,7 +252,7 @@ public function match($pathinfo)`
`252`	`252`	`* @throws MethodNotAllowedException If a matching resource was found but`
`253`	`253`	`* the request method is not allowed`
`254`	`254`	`*/`
`255`		`- public function matchRequest(Request $request)`
	`255`	`+ public function matchRequest(Request $request): array`
`256`	`256`	`{`
`257`	`257`	`if ($this->eventDispatcher) {`
`258`	`258`	`$event = new RouterMatchEvent($request);`
`@@ -294,7 +294,7 @@ public function setContext(RequestContext $context)`
`294`	`294`	`*`
`295`	`295`	`* @api`
`296`	`296`	`*/`
`297`		`- public function getContext()`
	`297`	`+ public function getContext(): RequestContext`
`298`	`298`	`{`
`299`	`299`	`return $this->context;`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,15 @@ public function __construct(RouteProviderInterface $provider)`
`32`	`32`	`/**`
`33`	`33`	`* {@inheritdoc}`
`34`	`34`	`*/`
`35`		`- public function getIterator()`
	`35`	`+ public function getIterator(): \ArrayIterator`
`36`	`36`	`{`
`37`	`37`	`return new \ArrayIterator($this->all());`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* Gets the number of Routes in this collection.`
`42`		`- *`
`43`		`- * @return int The number of routes`
`44`	`42`	`*/`
`45`		`- public function count()`
	`43`	`+ public function count(): int`
`46`	`44`	`{`
`47`	`45`	`return count($this->all());`
`48`	`46`	`}`
`@@ -52,7 +50,7 @@ public function count()`
`52`	`50`	`*`
`53`	`51`	`* @return Route[] An array of routes`
`54`	`52`	`*/`
`55`		`- public function all()`
	`53`	`+ public function all(): array`
`56`	`54`	`{`
`57`	`55`	`return $this->provider->getRoutesByNames(null);`
`58`	`56`	`}`
`@@ -61,15 +59,13 @@ public function all()`
`61`	`59`	`* Gets a route by name.`
`62`	`60`	`*`
`63`	`61`	`* @param string $name The route name`
`64`		`- *`
`65`		`- * @return Route\|null A Route instance or null when not found`
`66`	`62`	`*/`
`67`		`- public function get($name)`
	`63`	`+ public function get($name): ?Route`
`68`	`64`	`{`
`69`	`65`	`try {`
`70`	`66`	`return $this->provider->getRouteByName($name);`
`71`	`67`	`} catch (RouteNotFoundException $e) {`
`72`		`- return;`
	`68`	`+ return null;`
`73`	`69`	`}`
`74`	`70`	`}`
`75`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function setFinalMatcher(FinalMatcherInterface $final)`
`135`	`135`	`/**`
`136`	`136`	`* {@inheritdoc}`
`137`	`137`	`*/`
`138`		`- public function matchRequest(Request $request)`
	`138`	`+ public function matchRequest(Request $request): array`
`139`	`139`	`{`
`140`	`140`	`$collection = $this->routeProvider->getRouteCollectionForRequest($request);`
`141`	`141`	`if (!count($collection)) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function finalMatch(RouteCollection $collection, Request $request)`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- protected function getAttributes(Route $route, $name, array $attributes)`
	`46`	`+ protected function getAttributes(Route $route, $name, array $attributes): array`
`47`	`47`	`{`
`48`	`48`	`if ($route instanceof RouteObjectInterface && is_string($route->getRouteKey())) {`
`49`	`49`	`$name = $route->getRouteKey();`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,9 @@ protected function loadNextElements($offset)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`72`		`- * {@inheritdoc}`
	`72`	`+ * @return mixed`
`73`	`73`	`*/`
	`74`	`+ #[\ReturnTypeWillChange]`
`74`	`75`	`public function current()`
`75`	`76`	`{`
`76`	`77`	`return current($this->currentRoutes);`
`@@ -79,7 +80,7 @@ public function current()`
`79`	`80`	`/**`
`80`	`81`	`* {@inheritdoc}`
`81`	`82`	`*/`
`82`		`- public function next()`
	`83`	`+ public function next(): void`
`83`	`84`	`{`
`84`	`85`	`$result = next($this->currentRoutes);`
`85`	`86`	`if (false === $result) {`
`@@ -89,8 +90,9 @@ public function next()`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`/**`
`92`		`- * {@inheritdoc}`
	`93`	`+ * @return mixed`
`93`	`94`	`*/`
	`95`	`+ #[\ReturnTypeWillChange]`
`94`	`96`	`public function key()`
`95`	`97`	`{`
`96`	`98`	`return key($this->currentRoutes);`
`@@ -99,15 +101,15 @@ public function key()`
`99`	`101`	`/**`
`100`	`102`	`* {@inheritdoc}`
`101`	`103`	`*/`
`102`		`- public function valid()`
	`104`	`+ public function valid(): bool`
`103`	`105`	`{`
`104`		`- return key($this->currentRoutes);`
	`106`	`+ return null !== key($this->currentRoutes);`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`/**`
`108`	`110`	`* {@inheritdoc}`
`109`	`111`	`*/`
`110`		`- public function rewind()`
	`112`	`+ public function rewind(): void`
`111`	`113`	`{`
`112`	`114`	`$this->current = 0;`
`113`	`115`	`$this->currentRoutes = null;`