From d33183eb7d196006f40c72c6b9ed3aa74cdc32c6 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Thu, 22 Oct 2020 10:30:38 +0200
Subject: [PATCH 1/3] Fixing broken tests

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

diff --git a/composer.json b/composer.json
index 3b419ce..2623d22 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.2",
-        "php-http/client-integration-tests": "dev-master",
+        "php-http/client-integration-tests": "^3.0",
         "php-http/message": "^1.0",
         "php-http/client-common": "^2.0"
     },
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
index a6ffda7..43d26a6 100644
--- a/tests/BaseTestCase.php
+++ b/tests/BaseTestCase.php
@@ -28,7 +28,7 @@ public function stopServer($name)
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         foreach (array_keys($this->servers) as $name) {
             $this->stopServer($name);

From 0b4e222582e46c72f7c2ce5abbdb99af6ce4e7a9 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Thu, 22 Oct 2020 10:44:12 +0200
Subject: [PATCH 2/3] Bump deps

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 2623d22..e10ad77 100644
--- a/composer.json
+++ b/composer.json
@@ -10,16 +10,16 @@
     ],
     "require": {
         "php": "^7.1",
-        "nyholm/psr7": "^1.0",
+        "nyholm/psr7": "^1.3",
         "php-http/httplug": "^2.0",
         "psr/http-client": "^1.0",
-        "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+        "symfony/options-resolver": "^2.6 || ^3.4 || ^4.4 || ^5.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.2",
         "php-http/client-integration-tests": "^3.0",
-        "php-http/message": "^1.0",
-        "php-http/client-common": "^2.0"
+        "php-http/message": "^1.9",
+        "php-http/client-common": "^2.3"
     },
     "provide": {
         "php-http/client-implementation": "1.0",

From b1bbc50e5506fd1519c76e3acff64ec276a90843 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Thu, 22 Oct 2020 10:48:13 +0200
Subject: [PATCH 3/3] Use PHPunit 8.5

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

diff --git a/composer.json b/composer.json
index e10ad77..3d0eefa 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
         "friendsofphp/php-cs-fixer": "^2.2",
         "php-http/client-integration-tests": "^3.0",
         "php-http/message": "^1.9",
-        "php-http/client-common": "^2.3"
+        "php-http/client-common": "^2.3",
+        "phpunit/phpunit": "^8.5.8"
     },
     "provide": {
         "php-http/client-implementation": "1.0",