Skip to content

Commit 93beecf

Browse files
committed
Merge remote-tracking branch 'origin/1.10.x' into 1.11.x
2 parents a649981 + 1453c3f commit 93beecf

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

build/composer-dependency-analyser.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@
2626
->ignoreErrorsOnPackages(
2727
[
2828
'hoa/regex', // used only via stream wrapper hoa://
29-
'react/async', // function usage (https://github.com/shipmonk-rnd/composer-dependency-analyser/issues/67)
3029
...$pinnedToSupportPhp72, // those are unused, but we need to pin them to support PHP 7.2
3130
...$polyfills, // not detected by composer-dependency-analyser
3231
],
3332
[ErrorType::UNUSED_DEPENDENCY],
3433
)
3534
->ignoreErrorsOnPackage('phpunit/phpunit', [ErrorType::DEV_DEPENDENCY_IN_PROD]) // prepared test tooling
3635
->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
37-
->ignoreErrorsOnPath(__DIR__ . '/../tests', [ErrorType::UNKNOWN_CLASS]) // to be able to test invalid symbols
36+
->ignoreErrorsOnPath(__DIR__ . '/../tests', [ErrorType::UNKNOWN_CLASS, ErrorType::UNKNOWN_FUNCTION]) // to be able to test invalid symbols
3837
->ignoreUnknownClasses([
3938
'JetBrains\PhpStorm\Pure', // not present on composer's classmap
4039
'PHPStan\ExtensionInstaller\GeneratedConfig', // generated

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"phpstan/phpstan-phpunit": "^1.0",
6363
"phpstan/phpstan-strict-rules": "^1.6",
6464
"phpunit/phpunit": "^9.5.4",
65-
"shipmonk/composer-dependency-analyser": "^1.0",
65+
"shipmonk/composer-dependency-analyser": "^1.5",
6666
"shipmonk/name-collision-detector": "^2.0"
6767
},
6868
"config": {

composer.lock

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)