diff --git a/.phpunit-watcher.yml b/.phpunit-watcher.yml
new file mode 100644
index 000000000..0e4d76634
--- /dev/null
+++ b/.phpunit-watcher.yml
@@ -0,0 +1,11 @@
+watch:
+    directories:
+        - src
+        - tests
+    fileMask: '*.php'
+notifications:
+    passingTests: false
+    failingTests: false
+phpunit:
+    binaryPath: vendor/bin/phpunit
+    timeout: 180
diff --git a/composer.json b/composer.json
index 39240996f..2e88ba7e8 100644
--- a/composer.json
+++ b/composer.json
@@ -18,32 +18,33 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
+        "php": "^7.4|^8.0",
+        "ext-mbstring": "*",
+        "psr/log": "^1.1",
         "yiisoft/aliases": "^1.1",
         "yiisoft/arrays": "^3.0@dev",
-        "yiisoft/strings": "^1.1",
-        "yiisoft/profiler": "dev-master",
         "yiisoft/assets": "dev-master",
-        "yiisoft/view": "^3.0@dev",
-        "yiisoft/proxy": "dev-master",
-        "yiisoft/di": "^3.0@dev",
         "yiisoft/container-proxy": "dev-master",
+        "yiisoft/di": "^3.0@dev",
+        "yiisoft/profiler": "dev-master",
+        "yiisoft/proxy": "dev-master",
+        "yiisoft/strings": "^1.1",
         "yiisoft/var-dumper": "^3.0@dev",
-        "yiisoft/yii-filesystem": "dev-master",
-        "yiisoft/yii-web": "^3.0@dev",
+        "yiisoft/view": "^3.0@dev",
         "yiisoft/yii-console": "^3.0@dev",
-        "psr/log": "^1.1",
-        "ext-mbstring": "*",
-        "php": "^7.4|^8.0"
+        "yiisoft/yii-filesystem": "dev-master",
+        "yiisoft/yii-web": "^3.0@dev"
     },
     "require-dev": {
         "nyholm/psr7": "^1.3",
         "phpunit/phpunit": "^9.4",
-        "roave/infection-static-analysis-plugin": "^1.4",
-        "vimeo/psalm": "^4.1",
-        "yiisoft/log": "^3.0@dev",
+        "roave/infection-static-analysis-plugin": "^1.5",
+        "spatie/phpunit-watcher": "^1.23",
+        "vimeo/psalm": "^4.2",
         "yiisoft/cache": "^3.0@dev",
         "yiisoft/composer-config-plugin": "^1.0@dev",
-        "yiisoft/event-dispatcher": "^3.0@dev"
+        "yiisoft/event-dispatcher": "^3.0@dev",
+        "yiisoft/log": "^3.0@dev"
     },
     "autoload": {
         "psr-4": {