summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
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 9a1aa20..bdb2f92 100644
--- a/composer.json
+++ b/composer.json
@@ -17,14 +17,11 @@
"psr-4": {"phpmock\\phpunit\\": "classes/"}
},
"require": {
- "php": ">=5.5",
- "phpunit/phpunit": "^4.0.0 || ^5.0.0",
- "php-mock/php-mock-integration": "^1"
+ "php": ">=7",
+ "phpunit/phpunit": "^6 <6.5",
+ "php-mock/php-mock-integration": "^2"
},
"archive": {
"exclude": ["/tests"]
- },
- "conflict": {
- "phpunit/phpunit-mock-objects": "3.2.0"
}
}