summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-08-31 21:22:19 +0200
committerRemi Collet <fedora@famillecollet.com>2016-08-31 21:22:19 +0200
commitd05cbf6976a8979bd33cf2e1cfa8fb0c4249b4c4 (patch)
treec43d9b3aec81a7a2445dd5c4f3521051e647b364 /composer.json
parent64d945b9a9db8e788972d6c25468dae83a094532 (diff)
php-phpunit-PHPUnit-MockObject: switch the spec
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json13
1 files changed, 8 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index 12fb934..29a06e8 100644
--- a/composer.json
+++ b/composer.json
@@ -20,13 +20,16 @@
"irc": "irc://irc.freenode.net/phpunit"
},
"require": {
- "php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2",
+ "php": "^5.6 || ^7.0",
+ "phpunit/php-text-template": "^1.2",
"doctrine/instantiator": "^1.0.2",
- "sebastian/exporter": "~1.2"
+ "sebastian/exporter": "^1.2"
},
"require-dev": {
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^5.4"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<5.4.0"
},
"suggest": {
"ext-soap": "*"
@@ -43,7 +46,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "3.2.x-dev"
}
}
}