Skip to content

Commit 97408e6

Browse files
janedbalondrejmirtes
authored andcommitted
Replace composer-require-checker with composer-dependency-analyser
1 parent 039a3dc commit 97408e6

7 files changed

+97
-43
lines changed

.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ jobs:
103103
- name: "Install dependencies"
104104
run: "composer install --no-interaction --no-progress"
105105

106-
- name: "Composer Require Checker"
107-
run: "make composer-require-checker"
106+
- name: "Composer Dependency Analyser"
107+
run: "make composer-dependency-analyser"
108108

109109
name-collision:
110110
name: "Name Collision Detector"

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ phpstan-generate-baseline-php:
9494
phpstan-pro:
9595
php -d memory_limit=448M bin/phpstan --pro
9696

97-
composer-require-checker:
98-
php build/composer-require-checker.phar check --config-file $(CURDIR)/build/composer-require-checker.json
99-
10097
name-collision:
10198
php vendor/bin/detect-collisions --configuration build/collision-detector.json
99+
100+
composer-dependency-analyser:
101+
php vendor/bin/composer-dependency-analyser --config build/composer-dependency-analyser.php
+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php declare(strict_types = 1);
2+
3+
use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
4+
use ShipMonk\ComposerDependencyAnalyser\Config\ErrorType;
5+
6+
$config = new Configuration();
7+
8+
return $config
9+
->addPathToScan(__DIR__ . '/../bin', true)
10+
->ignoreErrors([ErrorType::UNUSED_DEPENDENCY])
11+
->ignoreErrorsOnPackage('phpunit/phpunit', [ErrorType::DEV_DEPENDENCY_IN_PROD]) // prepared test tooling
12+
->ignoreErrorsOnPackage('jetbrains/phpstorm-stubs', [ErrorType::PROD_DEPENDENCY_ONLY_IN_DEV]) // there is no direct usage, but we need newer version then required by ondrejmirtes/BetterReflection
13+
->ignoreErrorsOnPath(__DIR__ . '/../tests', [ErrorType::UNKNOWN_CLASS]) // to be able to test invalid symbols
14+
->ignoreUnknownClasses([
15+
'JetBrains\PhpStorm\Pure', // not present on composer's classmap
16+
'PHPStan\ExtensionInstaller\GeneratedConfig', // generated
17+
]);

build/composer-require-checker.json

-28
This file was deleted.

build/composer-require-checker.phar

-644 KB
Binary file not shown.

composer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"fidry/cpu-core-counter": "^0.5.0",
1414
"hoa/compiler": "3.17.08.08",
1515
"hoa/exception": "^1.0",
16+
"hoa/file": "1.17.07.11",
1617
"hoa/regex": "1.17.01.13",
1718
"jetbrains/phpstorm-stubs": "dev-master#717e2d512b1525a604d98b7799d0d6839448ee07",
1819
"nette/bootstrap": "^3.0",
1920
"nette/di": "3.1.10",
20-
"nette/finder": "^2.5",
2121
"nette/neon": "^3.3.1",
2222
"nette/schema": "^1.2.2",
2323
"nette/utils": "^3.2.5",
@@ -26,6 +26,7 @@
2626
"ondrejmirtes/better-reflection": "6.21.0",
2727
"phpstan/php-8-stubs": "0.3.84",
2828
"phpstan/phpdoc-parser": "1.25.0",
29+
"psr/http-message": "^1.1",
2930
"react/async": "^3",
3031
"react/child-process": "^0.6.4",
3132
"react/dns": "^1.10",
@@ -53,13 +54,15 @@
5354
"require-dev": {
5455
"brianium/paratest": "^6.5",
5556
"cweagans/composer-patches": "^1.7.3",
57+
"nette/finder": "^2.5",
5658
"ondrejmirtes/simple-downgrader": "^1.0",
5759
"php-parallel-lint/php-parallel-lint": "^1.2.0",
5860
"phpstan/phpstan-deprecation-rules": "^1.0",
5961
"phpstan/phpstan-nette": "^1.0",
6062
"phpstan/phpstan-phpunit": "^1.0",
6163
"phpstan/phpstan-strict-rules": "^1.5.1",
6264
"phpunit/phpunit": "^9.5.4",
65+
"shipmonk/composer-dependency-analyser": "^1.0",
6366
"shipmonk/name-collision-detector": "^2.0"
6467
},
6568
"config": {

composer.lock

+71-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)