From 20002cabc3a99f630c46ccc9804eb1d31e88de99 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Thu, 5 Feb 2026 10:32:27 +0300 Subject: [PATCH 1/2] Extract composer require checker to separate dir --- composer.json | 9 ++++++++- tools/.gitignore | 2 ++ tools/composer-require-checker/composer.json | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tools/.gitignore create mode 100644 tools/composer-require-checker/composer.json diff --git a/composer.json b/composer.json index addb593..91db6aa 100644 --- a/composer.json +++ b/composer.json @@ -39,9 +39,9 @@ "yiisoft/strings": "^2.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.9.1", "friendsofphp/php-cs-fixer": "^3.92.5", "httpsoft/http-message": "^1.1.6", - "maglnet/composer-require-checker": "^4.7.1", "phpunit/phpunit": "^10.5.52", "rector/rector": "^2.1.4", "roave/infection-static-analysis-plugin": "^1.35", @@ -60,6 +60,11 @@ } }, "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true, + "target-directory": "tools" + }, "config-plugin-options": { "source-directory": "config" }, @@ -71,11 +76,13 @@ "config": { "sort-packages": true, "allow-plugins": { + "bamarni/composer-bin-plugin": true, "infection/extension-installer": true, "composer/package-versions-deprecated": true } }, "scripts": { + "require-checker": "composer-require-checker", "test": "phpunit --testdox --no-interaction", "test-watch": "phpunit-watcher watch" } diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 0000000..cf452dc --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,2 @@ +/*/vendor +/*/composer.lock diff --git a/tools/composer-require-checker/composer.json b/tools/composer-require-checker/composer.json new file mode 100644 index 0000000..0992a90 --- /dev/null +++ b/tools/composer-require-checker/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "maglnet/composer-require-checker": "^4.7.1" + } +} From 0751c362e005853177da5a24390f2cd2e1bbcff1 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Thu, 5 Feb 2026 10:34:06 +0300 Subject: [PATCH 2/2] Remove `spatie/phpunit-watcher` --- .phpunit-watcher.yml | 11 ----------- composer.json | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 .phpunit-watcher.yml diff --git a/.phpunit-watcher.yml b/.phpunit-watcher.yml deleted file mode 100644 index 035a80a..0000000 --- a/.phpunit-watcher.yml +++ /dev/null @@ -1,11 +0,0 @@ -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 91db6aa..8948df7 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,6 @@ "phpunit/phpunit": "^10.5.52", "rector/rector": "^2.1.4", "roave/infection-static-analysis-plugin": "^1.35", - "spatie/phpunit-watcher": "^1.24", "vimeo/psalm": "^5.26.1 || ^6.8.0", "yiisoft/di": "^1.4" }, @@ -83,7 +82,6 @@ }, "scripts": { "require-checker": "composer-require-checker", - "test": "phpunit --testdox --no-interaction", - "test-watch": "phpunit-watcher watch" + "test": "phpunit --testdox --no-interaction" } }