From 3685d0649dcca1f8753bfb7a8e0165dcc69eb664 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 1 Jun 2018 09:31:50 +0200
Subject: update to 7.2.0 add dependency on doctrine/instantiator 1.1 raise
 dependency on myclabs/deep-copy 1.7 raise dependency on
 phpunit/php-code-coverage 6.0.6 raise dependency on phpunit/php-file-iterator
 2.0 phpunit/phpunit-mock-objects is merged open
 https://github.com/sebastianbergmann/phpunit/issues/3155 TypeError: Return
 value of PHPUnit\Framework\TestCase::getStatus()...

---
 composer.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 48b15a6..583b972 100644
--- a/composer.json
+++ b/composer.json
@@ -27,15 +27,15 @@
         "ext-libxml": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
-        "myclabs/deep-copy": "^1.6.1",
+        "doctrine/instantiator": "^1.1",
+        "myclabs/deep-copy": "^1.7",
         "phar-io/manifest": "^1.0.1",
         "phar-io/version": "^1.0",
         "phpspec/prophecy": "^1.7",
-        "phpunit/php-code-coverage": "^6.0.1",
-        "phpunit/php-file-iterator": "^1.4.3",
+        "phpunit/php-code-coverage": "^6.0.6",
+        "phpunit/php-file-iterator": "^2.0",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^2.0",
-        "phpunit/phpunit-mock-objects": "^6.1.1",
         "sebastian/comparator": "^3.0",
         "sebastian/diff": "^3.0",
         "sebastian/environment": "^3.1",
@@ -48,6 +48,9 @@
     "require-dev": {
         "ext-PDO": "*"
     },
+    "conflict": {
+        "phpunit/phpunit-mock-objects": "*"
+    },
     "config": {
         "platform": {
             "php": "7.1.0"
@@ -57,6 +60,7 @@
     },
     "suggest": {
         "phpunit/php-invoker": "^2.0",
+        "ext-soap": "*",
         "ext-xdebug": "*"
     },
     "bin": [
@@ -80,7 +84,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "7.1-dev"
+            "dev-master": "7.2-dev"
         }
     }
 }
-- 
cgit