From d8453b3c69f7cd1a3deb58c2330d1801a464cfb6 Mon Sep 17 00:00:00 2001 From: Vasek Purchart Date: Wed, 4 Dec 2024 11:03:28 +0100 Subject: [PATCH] replace Composer Require Checker with more capable Composer Dependency Analyser --- .github/workflows/ci.yml | 8 ++++---- build.xml | 15 +++++++++----- build/composer-dependency-analyser.config.php | 20 +++++++++++++++++++ composer.json | 4 ++-- 4 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 build/composer-dependency-analyser.config.php diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f6a6b7..a86a374 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,8 +99,8 @@ jobs: name: 'Check coding standard' run: 'bin/phing create-dirs cs || cat build/log/phpcs-checkstyle.xml | cs2pr' - composer-require-checker: - name: 'Composer require check' + composer-dependencies: + name: 'Composer dependencies' needs: 'lint' runs-on: 'ubuntu-latest' @@ -123,8 +123,8 @@ jobs: with: dependency-versions: 'highest' - - name: 'Check missing Composer requires' - run: 'bin/phing composer-require-checker' + name: 'Analyze Composer dependencies' + run: 'bin/phing composer-dependencies' tests: name: 'Tests - PHP ${{ matrix.php-version }}, ${{ matrix.composer-dependencies }} dependencies' diff --git a/build.xml b/build.xml index d8fa405..2f3bb7d 100644 --- a/build.xml +++ b/build.xml @@ -7,10 +7,12 @@ + - + + @@ -29,7 +31,7 @@ phplint, cs, tests, - composer-require-checker + composer-dependencies "/> @@ -43,13 +45,15 @@ - + + > + + @@ -81,6 +85,7 @@ + diff --git a/build/composer-dependency-analyser.config.php b/build/composer-dependency-analyser.config.php new file mode 100644 index 0000000..0fd4c3a --- /dev/null +++ b/build/composer-dependency-analyser.config.php @@ -0,0 +1,20 @@ +enableAnalysisOfUnusedDevDependencies(); +$config = $config->addPathToScan(__DIR__, true); + +// tools +$config = $config->ignoreErrorsOnPackages([ + 'consistence/coding-standard', + 'php-parallel-lint/php-console-highlighter', + 'php-parallel-lint/php-parallel-lint', +], [ErrorType::UNUSED_DEPENDENCY]); + +return $config; diff --git a/composer.json b/composer.json index e21c1c1..3849596 100644 --- a/composer.json +++ b/composer.json @@ -16,11 +16,11 @@ }, "require-dev": { "consistence/coding-standard": "3.10.1", - "maglnet/composer-require-checker": "2.0", "php-parallel-lint/php-console-highlighter": "1.0", "php-parallel-lint/php-parallel-lint": "1.3.2", "phpunit/phpunit": "8.5.25", - "vasek-purchart/phing-tester": "2.1" + "vasek-purchart/phing-tester": "2.1", + "shipmonk/composer-dependency-analyser": "1.8.1" }, "autoload": { "psr-4": {