Merge remote-tracking branch 'origin/master' into route-attr

# Conflicts:
#	composer.json

.github/workflows/rector.yml

@@ -14,8 +14,10 @@ name: rector
 jobs:
   rector:
     uses: yiisoft/actions/.github/workflows/rector.yml@master
+    secrets:
+      token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
     with:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.2']

.github/workflows/static.yml

@@ -10,6 +10,7 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +29,12 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']
+  psalm80:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm80.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']

.phpstorm.meta.php/Group.php

@@ -11,9 +11,8 @@
         'host',
         'hosts',
         'corsMiddleware',
-        'items',
-        'middlewareDefinitions',
-        'hasDispatcher',
-        'hasCorsMiddleware'
+        'routes',
+        'hasCorsMiddleware',
+        'enabledMiddlewares',
     );
-}
+}

.phpstorm.meta.php/Route.php

@@ -7,14 +7,13 @@
     registerArgumentsSet(
         'routeDataKeys',
         'name',
+        'pattern',
         'host',
         'hosts',
-        'pattern',
         'methods',
-        'override',
         'defaults',
-        'dispatcherWithMiddlewares',
-        'hasDispatcher',
-        'hasMiddlewares'
+        'override',
+        'hasMiddlewares',
+        'enabledMiddlewares',
     );
-}
+}

CHANGELOG.md

@@ -9,6 +9,8 @@
 - New #195: Add debug collector for `yiisoft/yii-debug` (@xepozz)
 - Chg #207: Replace two `RouteCollectorInterface` methods `addRoute()` and `addGroup()` to single `addRoute()` (@vjik)
 - Enh #202: Add support for `psr/http-message` version `^2.0` (@vjik)
+- Chg #222: Make `Route`, `Group` and `MatchingResult` dispatcher-independent (@rustamwin, @vjik)
+- Enh #229: Add URL arguments' psalm type in `UrlGeneratorInterface` (@vjik) 
 
 ## 3.0.0 February 17, 2023
 

UPGRADE.md

@@ -0,0 +1,34 @@
+# Upgrading Instructions for Yii Router
+
+This file contains the upgrade notes for the Yii Router.
+These notes highlight changes that could break your application when you upgrade it from one major version to another.
+
+## 4.0.0
+
+In this release classes `Route`, `Group` and `MatchingResult` are made dispatcher-independent. Now you don't can inject
+own middleware dispatcher to group or to route.
+
+The following backward incompatible changes have been made.
+
+### `Route`
+
+- Removed parameter `$dispatcher` from `Route` creating methods: `get()`, `post()`, `put()`, `delete()`, `patch()`,
+  `head()`, `options()`, `methods()`.
+- Removed methods `Route::injectDispatcher()` and `Route::withDispatcher()`.
+- `Route::getData()` changes:
+  - removed elements `dispatcherWithMiddlewares` and `hasDispatcher`;
+  - added element `enabledMiddlewares`.
+
+### `Group`
+
+- Removed parameter `$dispatcher` from `Group::create()` method.
+- Removed method `Group::withDispatcher()`.
+- `Group::getData()` changes:
+  - removed element `hasDispatcher`;
+  - key `items` renamed to `routes`;
+  - key `middlewareDefinitions` renamed to `enabledMiddlewares`.
+
+### `MatchingResult`
+
+- Removed `MatchingResult` implementation from `MiddlewareInterface`, so it is no longer middleware.
+- Removed method `MatchingResult::process()`.

composer.json

@@ -33,15 +33,15 @@
         "nyholm/psr7": "^1.5",
         "phpunit/phpunit": "^9.5",
         "psr/container": "^1.1|^2.0",
-        "rector/rector": "^0.18.3",
+        "rector/rector": "^0.19.0",
         "roave/infection-static-analysis-plugin": "^1.18",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.6",
+        "vimeo/psalm": "^4.30|^5.20",
         "yiisoft/di": "^1.0",
         "yiisoft/dummy-provider": "^1.0.0",
-        "yiisoft/yii-debug": "dev-master",
-        "yiisoft/hydrator": "dev-master as 1.0",
-        "yiisoft/test-support": "^3.0"
+        "yiisoft/hydrator": "dev-master",
+        "yiisoft/test-support": "^3.0",
+        "yiisoft/yii-debug": "dev-master|dev-php80"
     },
     "autoload": {
         "psr-4": {

psalm.xml

@@ -10,7 +10,11 @@
     <projectFiles>
         <directory name="src" />
         <ignoreFiles>
-            <directory name="vendor"/>
+            <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
+    </issueHandlers>
 </psalm>

psalm80.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="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"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+    </issueHandlers>
+</psalm>

src/Debug/DebugRoutesCommand.php

@@ -52,8 +52,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $data = $route->__debugInfo();
                 $action = '';
                 $middlewares = [];
-                if (!empty($data['middlewareDefinitions'])) {
-                    $middlewareDefinitions = $data['middlewareDefinitions'];
+                if (!empty($data['enabledMiddlewares'])) {
+                    $middlewareDefinitions = $data['enabledMiddlewares'];
                     $action = array_pop($middlewareDefinitions);
                     $middlewares = $middlewareDefinitions;
                 }
@@ -91,8 +91,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         foreach ($this->routeCollection->getRoutes() as $route) {
             $data = $route->__debugInfo();
             $action = '';
-            if (!empty($data['middlewareDefinitions'])) {
-                $middlewareDefinitions = $data['middlewareDefinitions'];
+            if (!empty($data['enabledMiddlewares'])) {
+                $middlewareDefinitions = $data['enabledMiddlewares'];
                 $action = array_pop($middlewareDefinitions);
             }
             $rows[] = [

src/Debug/RouterCollector.php

@@ -131,15 +131,10 @@ private function getMiddlewaresAndAction(?Route $route): array
         if ($route === null) {
             return [[], null];
         }
-        $reflection = new ReflectionObject($route);
 
-        $reflectionProperty = $reflection->getProperty('middlewareDefinitions');
-        $reflectionProperty->setAccessible(true);
-        /**
-         * @var array[]|callable[]|string[] $middlewareDefinitions
-         */
-        $middlewareDefinitions = $reflectionProperty->getValue($route);
-        $action = array_pop($middlewareDefinitions);
-        return [$middlewareDefinitions, $action];
+        $middlewares = $route->getData('enabledMiddlewares');
+        $action = array_pop($middlewares);
+
+        return [$middlewares, $action];
     }
 }

src/Debug/UrlMatcherInterfaceProxy.php

@@ -10,8 +10,10 @@
 
 final class UrlMatcherInterfaceProxy implements UrlMatcherInterface
 {
-    public function __construct(private UrlMatcherInterface $urlMatcher, private RouterCollector $routerCollector)
-    {
+    public function __construct(
+        private UrlMatcherInterface $urlMatcher,
+        private RouterCollector $routerCollector
+    ) {
     }
 
     public function match(ServerRequestInterface $request): MatchingResult