From 16876e4b5524ae6c2c63b41985e383a0728e388b Mon Sep 17 00:00:00 2001
From: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
Date: Sat, 3 Nov 2018 12:47:08 +0100
Subject: [PATCH 1/3] Support PHPUnit 6.x

---
 composer.json             | 2 +-
 tests/PromiseCoreTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 795a50f..c5db3bc 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/client-integration-tests": "dev-master",
-        "phpunit/phpunit": "^4.8.27",
+        "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0",
         "zendframework/zend-diactoros": "^1.0"
     },
     "autoload": {
diff --git a/tests/PromiseCoreTest.php b/tests/PromiseCoreTest.php
index 081a9f9..9df678b 100644
--- a/tests/PromiseCoreTest.php
+++ b/tests/PromiseCoreTest.php
@@ -21,7 +21,7 @@ class PromiseCoreTest extends BaseUnitTestCase
      */
     public function testHandleIsNotAResource()
     {
-        $this->setExpectedException(
+        $this->expectException(
             \InvalidArgumentException::class,
             'Parameter $handle expected to be a cURL resource, NULL given'
         );
@@ -38,7 +38,7 @@ public function testHandleIsNotAResource()
      */
     public function testHandleIsNotACurlResource()
     {
-        $this->setExpectedException(
+        $this->expectException(
             \InvalidArgumentException::class,
             'Parameter $handle expected to be a cURL resource, stream resource given'
         );

From b5b44da789b2267cd59c4b9565b939e07c8497e1 Mon Sep 17 00:00:00 2001
From: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
Date: Sat, 3 Nov 2018 12:51:36 +0100
Subject: [PATCH 2/3] Support PHPUnit 7

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c5db3bc..092692f 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/client-integration-tests": "dev-master",
-        "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0",
+        "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0",
         "zendframework/zend-diactoros": "^1.0"
     },
     "autoload": {

From fbcd93c7c116127b22429f6592cf628c0c89b2be Mon Sep 17 00:00:00 2001
From: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
Date: Sat, 3 Nov 2018 12:56:54 +0100
Subject: [PATCH 3/3] Use latest PHPUnit

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 092692f..c545bc0 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/client-integration-tests": "dev-master",
-        "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0",
+        "phpunit/phpunit": "^7.0",
         "zendframework/zend-diactoros": "^1.0"
     },
     "autoload": {