danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Don't allow installation of psalm/phar and vimeo/psalm in the same project

Browse Source 
The scoped and non-scoped code don't work together.
This commit is contained in:
Barney Laurance 2019-06-07 21:49:41 +01:00 committed by Matthew Brown
parent c81a9a8737
commit 811cc08948
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/psalm-phar/composer.json
View File

@ -5,5 +5,8 @@
"require": { "require": {
"php": "^7.1" "php": "^7.1"
}, },
"conflict": {
"vimeo/psalm" : "*"
},
"bin": ["psalm.phar", "psalm", "psalter", "psalm-language-server", "psalm-plugin"] "bin": ["psalm.phar", "psalm", "psalter", "psalm-language-server", "psalm-plugin"]
} }