phpstan level 9

Author: dominikzogg

composer.json

@@ -67,7 +67,7 @@
         "test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
         "test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-directory=build/phpunit",
         "test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",
-        "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=8 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
+        "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=9 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
         "test:unit": "vendor/bin/phpunit --testsuite=Unit --coverage-text --coverage-clover=build/phpunit/clover.xml --coverage-html=build/phpunit/coverage-html --coverage-xml=build/phpunit/coverage-xml --log-junit=build/phpunit/junit.xml --cache-directory=build/phpunit"
     }
 }

phpstan.neon

@@ -1,8 +1 @@
 parameters:
-    ignoreErrors:
-        -
-            message: '/no value type specified in iterable type array/'
-            path: %currentWorkingDirectory%/src/*.php
-        -
-            message: '#Variable \$routeIndex might not be defined.#'
-            path: %currentWorkingDirectory%/src/UrlGenerator.php

src/RouteMatcher.php

@@ -46,20 +46,29 @@ public function match(ServerRequestInterface $request): RouteInterface
         }
 
         if (Dispatcher::METHOD_NOT_ALLOWED === $routeInfo[0]) {
+            /** @var array<string> */
+            $allowedMethods = $routeInfo[1];
+
             throw HttpException::createMethodNotAllowed([
                 'detail' => \sprintf(
                     'Method "%s" at path "%s" is not allowed. Must be one of: "%s"',
                     $method,
                     $path,
-                    implode('", "', $routeInfo[1]),
+                    implode('", "', $allowedMethods),
                 ),
             ]);
         }
 
+        /** @var string $routeName */
+        $routeName = $routeInfo[1];
+
         /** @var RouteInterface $route */
-        $route = $this->routesByName[$routeInfo[1]];
+        $route = $this->routesByName[$routeName];
+
+        /** @var array<string, string> */
+        $attributes = $routeInfo[2];
 
-        return $route->withAttributes($routeInfo[2]);
+        return $route->withAttributes($attributes);
     }
 
     private function getDispatcher(?string $cacheFile = null): Dispatcher

src/UrlGenerator.php

@@ -53,10 +53,9 @@ public function generatePath(string $name, array $attributes = [], array $queryP
         $routePath = $route->getPath();
 
         $routePartSets = array_reverse($this->routeParser->parse($routePath));
+        $routeParts = $this->findMatchingRouteParts($routePartSets, $attributes);
 
-        $routeIndex = $this->getRouteIndex($routePartSets, $attributes);
-
-        $path = $this->generatePathFromAttributes($name, $routePath, $routePartSets, $attributes, $routeIndex);
+        $path = $this->buildPath($name, $routePath, $routeParts, $attributes);
 
         if ([] === $queryParams) {
             return $this->basePath.$path;
@@ -75,42 +74,46 @@ private function getRoute(string $name): RouteInterface
     }
 
     /**
-     * @param array<int, array<int, array|string>> $routePartSets
-     * @param array<string>                        $attributes
+     * @param array<int, array<int, array<int, string>|string>> $routePartSets
+     * @param array<string>                                     $attributes
+     *
+     * @return array<int, array<int, string>|string>
      */
-    private function getRouteIndex(array $routePartSets, array $attributes): int
+    private function findMatchingRouteParts(array $routePartSets, array $attributes): array
     {
-        foreach ($routePartSets as $routeIndex => $routeParts) {
-            foreach ($routeParts as $routePart) {
-                if (\is_array($routePart)) {
-                    $parameter = $routePart[0];
-
-                    if (!isset($attributes[$parameter])) {
-                        continue 2;
-                    }
-                }
+        foreach ($routePartSets as $routeParts) {
+            if ($this->hasAllRequiredAttributes($routeParts, $attributes)) {
+                return $routeParts;
             }
+        }
+
+        return end($routePartSets) ?: [];
+    }
 
-            return $routeIndex;
+    /**
+     * @param array<int, array<int, string>|string> $routeParts
+     * @param array<string>                         $attributes
+     */
+    private function hasAllRequiredAttributes(array $routeParts, array $attributes): bool
+    {
+        foreach ($routeParts as $routePart) {
+            if (\is_array($routePart) && !isset($attributes[$routePart[0]])) {
+                return false;
+            }
         }
 
-        return $routeIndex;
+        return true;
     }
 
     /**
-     * @param array<int, array<int, array|string>> $routePartSets
-     * @param array<string>                        $attributes
+     * @param array<int, array<int, string>|string> $routeParts
+     * @param array<string>                         $attributes
      */
-    private function generatePathFromAttributes(
-        string $name,
-        string $path,
-        array $routePartSets,
-        array $attributes,
-        int $routeIndex
-    ): string {
+    private function buildPath(string $name, string $path, array $routeParts, array $attributes): string
+    {
         $pathParts = [];
 
-        foreach ($routePartSets[$routeIndex] as $routePart) {
+        foreach ($routeParts as $routePart) {
             $pathParts[] = \is_array($routePart)
                 ? $this->getAttributeValue($name, $path, $routePart, $attributes)
                 : $routePart;