Skip to content

Commit

Permalink
name-collision-detector 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed Sep 14, 2023
1 parent 95cdbe5 commit c3cb573
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ composer-require-checker:
php build/composer-require-checker.phar check --config-file $(CURDIR)/build/composer-require-checker.json

name-collision:
php vendor/bin/detect-collisions
php vendor/bin/detect-collisions --configuration build/collision-detector.json
14 changes: 14 additions & 0 deletions build/collision-detector.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"scanPaths": ["../src", "../build", "../tests"],
"excludePaths": [
"../tests/PHPStan/Analyser/data/parse-error.php",
"../tests/PHPStan/Analyser/data/multipleParseErrors.php",
"../tests/PHPStan/Parser/data/cleaning-1-before.php",
"../tests/PHPStan/Parser/data/cleaning-1-after.php",
"../tests/PHPStan/Rules/Functions/data/duplicate-function.php",
"../tests/PHPStan/Rules/Classes/data/duplicate-class.php",
"../tests/notAutoloaded",
"../tests/PHPStan/Rules/Functions/data/define-bug-3349.php",
"../tests/PHPStan/Levels/data/stubs/function.php"
]
}
14 changes: 0 additions & 14 deletions collision-detector.json

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"phpstan/phpstan-strict-rules": "^1.5.1",
"phpunit/phpunit": "^9.5.4",
"rector/rector": "^0.17",
"shipmonk/name-collision-detector": "dev-master"
"shipmonk/name-collision-detector": "^2.0"
},
"config": {
"platform": {
Expand Down
15 changes: 7 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c3cb573

Please sign in to comment.