From dfd9f021d97d1d7a17746bb82df0cbbf23b5bc01 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sat, 8 Aug 2026 08:21:25 +0300 Subject: [PATCH 1/2] Add Composer Dependency Analyser --- ...ecker.yml => composer-dependency-analyser.yml} | 12 +++++------- composer-dependency-analyser.php | 15 +++++++++++++++ composer-require-checker.json | 7 ------- composer.json | 3 ++- docs/internals.md | 6 +++--- 5 files changed, 25 insertions(+), 18 deletions(-) rename .github/workflows/{composer-require-checker.yml => composer-dependency-analyser.yml} (55%) create mode 100644 composer-dependency-analyser.php delete mode 100644 composer-require-checker.json diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-dependency-analyser.yml similarity index 55% rename from .github/workflows/composer-require-checker.yml rename to .github/workflows/composer-dependency-analyser.yml index dea1eb2..3fed6a3 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-dependency-analyser.yml @@ -1,13 +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' - - 'composer-require-checker.json' - - '.github/workflows/composer-require-checker.yml' + - 'composer-dependency-analyser.php' push: branches: ['master'] paths: *paths @@ -20,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..8ba6d94 --- /dev/null +++ b/composer-dependency-analyser.php @@ -0,0 +1,15 @@ +disableComposerAutoloadPathScan() + ->setFileExtensions(['php']) + ->addPathToScan(__DIR__ . '/src', isDev: false) + ->addPathToScan(__DIR__ . '/tests', isDev: true) + // ext-intl is used conditionally (guarded by extension_loaded('intl')) and ext-filter ships with PHP + // core by default, so neither is a hard requirement. Previously whitelisted in composer-require-checker.json. + ->ignoreErrorsOnExtensions(['ext-intl', 'ext-filter'], [ErrorType::SHADOW_DEPENDENCY]); diff --git a/composer-require-checker.json b/composer-require-checker.json deleted file mode 100644 index cb65187..0000000 --- a/composer-require-checker.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "symbol-whitelist": [ - "transliterator_transliterate", - "filter_var", - "FILTER_VALIDATE_INT" - ] -} diff --git a/composer.json b/composer.json index 203cd46..974c1e8 100644 --- a/composer.json +++ b/composer.json @@ -34,10 +34,10 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "friendsofphp/php-cs-fixer": "^3.95", - "maglnet/composer-require-checker": "^4.7.1", "phpbench/phpbench": "^1.4.1", "phpunit/phpunit": "^10.5.48", "rector/rector": "^2.1.2", + "shipmonk/composer-dependency-analyser": "^1.8", "spatie/phpunit-watcher": "^1.24", "yiisoft/code-style": "^1.0" }, @@ -67,6 +67,7 @@ }, "scripts": { "cs-fix": "php-cs-fixer fix", + "dependency-analyser": "composer-dependency-analyser", "rector": "rector", "psalm": "psalm", "test": "phpunit", diff --git a/docs/internals.md b/docs/internals.md index 087a514..b77907c 100644 --- a/docs/internals.md +++ b/docs/internals.md @@ -36,9 +36,9 @@ use either newest or any specific version of PHP: ## Dependencies -This package uses [composer-require-checker](https://github.com/maglnet/ComposerRequireChecker) to check if -all dependencies are correctly defined in `composer.json`. To run the checker, execute the following command: +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 ``` From 35e92803d3aa76f0f317a7431866307b3112d6bb Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 9 Aug 2026 19:32:29 +0300 Subject: [PATCH 2/2] fix --- composer-dependency-analyser.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php index 8ba6d94..ab0073a 100644 --- a/composer-dependency-analyser.php +++ b/composer-dependency-analyser.php @@ -10,6 +10,7 @@ ->setFileExtensions(['php']) ->addPathToScan(__DIR__ . '/src', isDev: false) ->addPathToScan(__DIR__ . '/tests', isDev: true) - // ext-intl is used conditionally (guarded by extension_loaded('intl')) and ext-filter ships with PHP - // core by default, so neither is a hard requirement. Previously whitelisted in composer-require-checker.json. - ->ignoreErrorsOnExtensions(['ext-intl', 'ext-filter'], [ErrorType::SHADOW_DEPENDENCY]); + // ext-intl is used conditionally (guarded by extension_loaded('intl')), so it's not a hard requirement. + ->ignoreErrorsOnExtensions(['ext-intl'], [ErrorType::SHADOW_DEPENDENCY]) + // ext-filter is optional dependency + ->ignoreErrorsOnExtensions(['ext-filter'], [ErrorType::SHADOW_DEPENDENCY]);