Merge remote-tracking branch 'origin/solution' into solution

Author: xepozz

composer.json

@@ -56,7 +56,7 @@
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.30|^5.25",
         "yiisoft/di": "^1.1",
-        "yiisoft/test-support": "^1.3"
+        "yiisoft/test-support": "^3.0"
     },
     "autoload": {
         "psr-4": {