From e9610d8fd0eb15e26febbf0c33d98d2d99de1a9e Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 8 Aug 2026 08:20:54 +0300 Subject: [PATCH 1/2] Add Composer Dependency Analyser --- ...e-checker.yml => composer-dependency-analyser.yml} | 11 +++++------ composer-dependency-analyser.php | 11 +++++++++++ composer.json | 4 +++- docs/internals.md | 6 +++--- tools/composer-require-checker/composer.json | 5 ----- 5 files changed, 22 insertions(+), 15 deletions(-) rename .github/workflows/{composer-require-checker.yml => composer-dependency-analyser.yml} (57%) create mode 100644 composer-dependency-analyser.php delete mode 100644 tools/composer-require-checker/composer.json diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-dependency-analyser.yml similarity index 57% rename from .github/workflows/composer-require-checker.yml rename to .github/workflows/composer-dependency-analyser.yml index 99be65f..3fed6a3 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-dependency-analyser.yml @@ -1,12 +1,13 @@ -name: Composer require checker +name: composer dependency analyser on: pull_request: paths: &paths - 'src/**' - 'tests/**' + - '.github/workflows/composer-dependency-analyser.yml' - 'composer.json' - - '.github/workflows/composer-require-checker.yml' + - 'composer-dependency-analyser.php' push: branches: ['master'] paths: *paths @@ -19,10 +20,8 @@ concurrency: cancel-in-progress: true jobs: - composer-require-checker: - uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master + composer-dependency-analyser: + uses: yiisoft/actions/.github/workflows/composer-dependency-analyser.yml@master with: - os: >- - ['ubuntu-latest'] php: >- ['8.1', '8.2', '8.3', '8.4', '8.5'] diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php new file mode 100644 index 0000000..5b4c026 --- /dev/null +++ b/composer-dependency-analyser.php @@ -0,0 +1,11 @@ +disableComposerAutoloadPathScan() + ->setFileExtensions(['php']) + ->addPathToScan(__DIR__ . '/src', isDev: false) + ->addPathToScan(__DIR__ . '/tests', isDev: true); diff --git a/composer.json b/composer.json index 173c87a..b65d944 100644 --- a/composer.json +++ b/composer.json @@ -41,6 +41,7 @@ "phpunit/phpunit": "^10.5.46", "rector/rector": "^2.0.16", "roave/infection-static-analysis-plugin": "^1.35", + "shipmonk/composer-dependency-analyser": "^1.8", "vimeo/psalm": "^5.26.1 || ^6.11.0" }, "autoload": { @@ -69,6 +70,7 @@ } }, "scripts": { - "test": "phpunit --testdox --no-interaction" + "test": "phpunit --testdox --no-interaction", + "dependency-analyser": "composer-dependency-analyser" } } diff --git a/docs/internals.md b/docs/internals.md index 30f70c0..b77907c 100644 --- a/docs/internals.md +++ b/docs/internals.md @@ -36,9 +36,9 @@ use either newest or any specific version of PHP: ## Dependencies -Use [ComposerRequireChecker](https://github.com/maglnet/ComposerRequireChecker) to detect transitive -[Composer](https://getcomposer.org) dependencies: +Use [Composer Dependency Analyser](https://github.com/shipmonk-rnd/composer-dependency-analyser) to detect unknown, +shadow, and unused [Composer](https://getcomposer.org) dependencies: ```shell -./vendor/bin/composer-require-checker +./vendor/bin/composer-dependency-analyser ``` diff --git a/tools/composer-require-checker/composer.json b/tools/composer-require-checker/composer.json deleted file mode 100644 index 0992a90..0000000 --- a/tools/composer-require-checker/composer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "require-dev": { - "maglnet/composer-require-checker": "^4.7.1" - } -} From 002ad8beb06b9ad3f3fd15bedb2272cdc74d39c2 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 8 Aug 2026 08:46:58 +0300 Subject: [PATCH 2/2] remove bamarni --- composer.json | 9 --------- tools/.gitignore | 2 -- 2 files changed, 11 deletions(-) delete mode 100644 tools/.gitignore diff --git a/composer.json b/composer.json index b65d944..a9aad27 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,6 @@ "psr/http-server-middleware": "^1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.3", "friendsofphp/php-cs-fixer": "^3.92", "httpsoft/http-message": "^1.1.6", "phpunit/phpunit": "^10.5.46", @@ -54,17 +53,9 @@ "Yiisoft\\HttpMiddleware\\Tests\\": "tests" } }, - "extra": { - "bamarni-bin": { - "bin-links": true, - "target-directory": "tools", - "forward-command": true - } - }, "config": { "sort-packages": true, "allow-plugins": { - "bamarni/composer-bin-plugin": true, "infection/extension-installer": true, "composer/package-versions-deprecated": true } diff --git a/tools/.gitignore b/tools/.gitignore deleted file mode 100644 index cf452dc..0000000 --- a/tools/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*/vendor -/*/composer.lock