diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-dependency-analyser.yml similarity index 59% rename from .github/workflows/composer-require-checker.yml rename to .github/workflows/composer-dependency-analyser.yml index 8690377..eaa3762 100644 --- a/.github/workflows/composer-require-checker.yml +++ b/.github/workflows/composer-dependency-analyser.yml @@ -1,4 +1,4 @@ -name: Composer require checker +name: composer dependency analyser on: pull_request: @@ -6,8 +6,9 @@ on: - 'src/**' - 'config/**' - 'tests/**' + - '.github/workflows/composer-dependency-analyser.yml' - 'composer.json' - - '.github/workflows/composer-require-checker.yml' + - 'composer-dependency-analyser.php' push: branches: ['master'] paths: *paths @@ -20,10 +21,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..fd085a5 --- /dev/null +++ b/composer-dependency-analyser.php @@ -0,0 +1,14 @@ +disableComposerAutoloadPathScan() + ->setFileExtensions(['php']) + ->addPathToScan(__DIR__ . '/config', isDev: false) + ->addPathToScan(__DIR__ . '/src', isDev: false) + ->addPathToScan(__DIR__ . '/tests', isDev: true) + ->ignoreErrorsOnPackageAndPath('yiisoft/definitions', __DIR__ . '/config', [ErrorType::SHADOW_DEPENDENCY]); diff --git a/composer.json b/composer.json index 4e72518..f8fe7a9 100644 --- a/composer.json +++ b/composer.json @@ -39,12 +39,12 @@ "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", "phpunit/phpunit": "^10.5.52", "rector/rector": "^2.1.4", "roave/infection-static-analysis-plugin": "^1.35", + "shipmonk/composer-dependency-analyser": "^1.8", "vimeo/psalm": "^5.26.1 || ^6.8.0", "yiisoft/di": "^1.4", "yiisoft/test-support": "^3.2" @@ -60,11 +60,6 @@ } }, "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": true, - "target-directory": "tools" - }, "config-plugin-options": { "source-directory": "config" }, @@ -76,13 +71,12 @@ "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", + "dependency-analyser": "composer-dependency-analyser", "test": "phpunit --testdox" } } 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 ``` diff --git a/tests/Middleware/ContentNegotiatorTest.php b/tests/Middleware/ContentNegotiatorTest.php index 869a831..4f2ec1c 100644 --- a/tests/Middleware/ContentNegotiatorTest.php +++ b/tests/Middleware/ContentNegotiatorTest.php @@ -6,7 +6,7 @@ use Psr\Http\Message\ResponseInterface; use RuntimeException; -use StdClass; +use stdClass; use Yiisoft\DataResponse\DataResponse; use Yiisoft\DataResponse\Formatter\HtmlDataResponseFormatter; use Yiisoft\DataResponse\Formatter\XmlDataResponseFormatter; @@ -81,7 +81,7 @@ public function testWrongContentFormattersInConstructor(): void ); new ContentNegotiator([ 'text/html' => new HtmlDataResponseFormatter(), - 'application/xml' => new StdClass(), + 'application/xml' => new stdClass(), ]); } 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 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" - } -}