summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-02-24 09:41:46 +0100
committerRemi Collet <remi@remirepo.net>2020-02-24 09:41:46 +0100
commita0ff3ec9e173f8b259a8dff0d8194ea40ab6bc99 (patch)
tree54adbd1152242c5a73500c2ac6379080854ce084 /composer.json
parent273f11dde28c00de14dd0d97daa578304853b833 (diff)
v1.7.0 from Fedora
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json9
1 files changed, 3 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index b6002ef..34350b2 100644
--- a/composer.json
+++ b/composer.json
@@ -18,13 +18,10 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "phpunit/phpunit": "^4.6",
- "sebastian/version": "^1.0.1"
+ "phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev"
- }
+ "conflict": {
+ "vimeo/psalm": "<3.6.0"
},
"autoload": {
"psr-4": {