PHP 8.4 + Adapt to Yii Router 4

.github/workflows/build.yml

@@ -29,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

.github/workflows/composer-require-checker.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

.github/workflows/rector.yml

@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']

.github/workflows/static.yml

@@ -29,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

CHANGELOG.md

@@ -1,9 +1,12 @@
 # Yii Router FastRoute Adapter Change Log
 
-## 3.1.1 under development
+## 4.0.0 under development
 
 - Enh #154: Add `UrlGenerator` host and scheme properties to package config params (@ev-gor)
 - Chg #157: Bump minimal PHP version to 8.1 and minor refactoring (@vjik)
+- Chg #158: Change PHP constraint in `composer.json` to `8.1 - 8.4` (@vjik)
+- Chg #158: Adapt to `yiisoft/router` version `^4.0` (@vjik)
+- Enh #158: Use FQN for built-in PHP functions (@vjik)
 
 ## 3.1.0 March 19, 2024
 

composer.json

@@ -27,12 +27,12 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "8.1 - 8.4",
         "nikic/fast-route": "^1.3",
-        "psr/http-message": "^1.0|^2.0",
-        "psr/simple-cache": "^2.0|^3.0",
+        "psr/http-message": "^1.0 || ^2.0",
+        "psr/simple-cache": "^2.0 || ^3.0",
         "yiisoft/http": "^1.2",
-        "yiisoft/router": "^2.1|^3.0"
+        "yiisoft/router": "^4"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.7.1",
@@ -42,7 +42,7 @@
         "rector/rector": "^2.0.9",
         "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
-        "vimeo/psalm": "^5.26.1",
+        "vimeo/psalm": "^5.26.1 || ^6.8.6",
         "yiisoft/di": "^1.3",
         "yiisoft/test-support": "^3.0.2"
     },

psalm.xml

@@ -3,6 +3,7 @@
     errorLevel="1"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
+    ensureOverrideAttribute="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

src/UrlGenerator.php

@@ -17,8 +17,10 @@
 use function array_key_exists;
 use function array_keys;
 use function implode;
+use function is_scalar;
 use function is_string;
 use function preg_match;
+use function sprintf;
 
 final class UrlGenerator implements UrlGeneratorInterface
 {
@@ -50,8 +52,12 @@
      *
      * @throws RuntimeException If parameter value does not match its regex.
      */
-    public function generate(string $name, array $arguments = [], array $queryParameters = []): string
-    {
+    public function generate(
+        string $name,
+        array $arguments = [],
+        array $queryParameters = [],
+        ?string $hash = null,
+    ): string {
         $arguments = array_map('\strval', array_merge($this->defaultArguments, $arguments));
         $route = $this->routeCollection->getRoute($name);
         /** @var list<list<list<string>|string>> $parsedRoutes */
@@ -72,7 +78,7 @@
                 continue;
             }
 
-            return $this->generatePath($arguments, $queryParameters, $parsedRouteParts);
+            return $this->generatePath($arguments, $queryParameters, $parsedRouteParts, $hash);
         }
 
         // No valid route was found: list minimal required parameters.
@@ -90,10 +96,11 @@
         string $name,
         array $arguments = [],
         array $queryParameters = [],
+        ?string $hash = null,
         ?string $scheme = null,
-        ?string $host = null
+        ?string $host = null,
     ): string {
-        $url = $this->generate($name, $arguments, $queryParameters);
+        $url = $this->generate($name, $arguments, $queryParameters, $hash);
         $route = $this->routeCollection->getRoute($name);
         $uri = $this->currentRoute && $this->currentRoute->getUri() !== null ? $this->currentRoute->getUri() : null;
         $lastRequestScheme = $uri?->getScheme();
@@ -114,7 +121,7 @@
                 $host = '//' . $host;
             }
 
             return $this->ensureScheme(rtrim($host, '/') . $url, $scheme);
         }
 
         return $uri === null ? $url : $this->generateAbsoluteFromLastMatchedRequest($url, $uri, $scheme);
@@ -126,15 +133,16 @@
     public function generateFromCurrent(
         array $replacedArguments,
         array $queryParameters = [],
+        ?string $hash = null,
         ?string $fallbackRouteName = null,
     ): string {
         if ($this->currentRoute === null || $this->currentRoute->getName() === null) {
             if ($fallbackRouteName !== null) {
-                return $this->generate($fallbackRouteName, $replacedArguments);
+                return $this->generate($fallbackRouteName, $replacedArguments, hash: $hash);
             }
 
             if ($this->currentRoute !== null && $this->currentRoute->getUri() !== null) {
-                return $this->currentRoute->getUri()->getPath();
+                return $this->currentRoute->getUri()->getPath() . ($hash !== null ? '#' . $hash : '');
             }
 
             throw new RuntimeException('Current route is not detected.');
@@ -151,6 +159,7 @@
             $this->currentRoute->getName(),
             array_merge($this->currentRoute->getArguments(), $replacedArguments),
             $queryParameters,
+            $hash,
         );
     }
 
@@ -169,7 +178,7 @@
     {
         $port = '';
         $uriPort = $uri->getPort();
         if ($uriPort !== 80 && $uriPort !== null) {
             $port = ':' . $uriPort;
         }
 
@@ -219,7 +228,7 @@
      */
     private function isRelative(string $url): bool
     {
         return strncmp($url, '//', 2) && !str_contains($url, '://');
     }
 
     public function getUriPrefix(): string
@@ -274,7 +283,7 @@
      * @param array<string,string> $arguments
      * @param list<list<string>|string> $parts
      */
-    private function generatePath(array $arguments, array $queryParameters, array $parts): string
+    private function generatePath(array $arguments, array $queryParameters, array $parts, ?string $hash): string
     {
         $path = $this->getUriPrefix();
 
@@ -305,13 +314,13 @@
             }
         }
 
         $path = str_replace('//', '/', $path);
 
         $queryString = '';
         if (!empty($queryParameters)) {
             $queryString = http_build_query($queryParameters);
         }
 
-        return $path . (!empty($queryString) ? '?' . $queryString : '');
+        return $path . (!empty($queryString) ? '?' . $queryString : '') . ($hash !== null ? '#' . $hash : '');
     }
 }

src/UrlMatcher.php

@@ -18,6 +18,7 @@
 use Yiisoft\Router\UrlMatcherInterface;
 
 use function array_merge;
+use function count;
 
 /**
  * @psalm-type ResultNotFound = array{0:0}
@@ -82,7 +83,7 @@
     ) {
         $this->fastRouteCollector = $fastRouteCollector ?? $this->createRouteCollector();
         $this->dispatcherCallback = $dispatcherFactory;
         $this->loadConfig($config);
 
         $this->loadDispatchData();
     }
@@ -121,12 +122,12 @@
      */
     private function loadConfig(?array $config): void
     {
         if ($config === null) {
             return;
         }
 
         if (isset($config[self::CONFIG_CACHE_KEY])) {
             $this->cacheKey = (string) $config[self::CONFIG_CACHE_KEY];
         }
     }
 
@@ -213,7 +214,7 @@
     {
         foreach ($this->routeCollection->getRoutes() as $route) {
             if (!$route->getData('hasMiddlewares')) {
                 continue;
             }
 
             $hosts = $route->getData('hosts');