From 29cb020648d16afc98e289e65570455460bc3e2d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 5 Dec 2017 09:35:48 +0100
Subject: rename to php-mock-phpunit2 Update to 2.0.1 raise dependency on PHP 7
 raise dependency on php-mock-integration 2 switch top phpunit6

---
 composer.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'composer.json')

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"
     }
 }
-- 
cgit