From 957773fd83bab09e7165104ed288ec55e043afae Mon Sep 17 00:00:00 2001
From: JaskirtPooni <jaskirt@soapboxhq.com>
Date: Wed, 15 Jan 2020 16:05:03 -0500
Subject: [PATCH 1/5] Fixed failing tests due to guzzle/psr7 changes
 https://github.com/guzzle/psr7/pull/250/files#diff-5abca4d9d5693da46d10a54795b1192dR164

---
 tests/Unit/RequestTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Unit/RequestTest.php b/tests/Unit/RequestTest.php
index 4a9d43c..f42173b 100644
--- a/tests/Unit/RequestTest.php
+++ b/tests/Unit/RequestTest.php
@@ -24,7 +24,7 @@ public function assert_has_header_fails_when_the_header_does_not_exist()
      */
     public function assert_has_header_succeeds_when_the_header_exists()
     {
-        $request = new Request(new GuzzleRequest('get', '/test', ['header' => []]));
+        $request = new Request(new GuzzleRequest('get', '/test', ['header' => ['value']]));
         $request->assertHasHeader('header');
     }
 
@@ -33,7 +33,7 @@ public function assert_has_header_succeeds_when_the_header_exists()
      */
     public function assert_has_header_fails_when_the_header_with_the_specified_value_does_not_exist()
     {
-        $request = new Request(new GuzzleRequest('get', '/test', ['header' => []]));
+        $request = new Request(new GuzzleRequest('get', '/test', ['header' => ['notValue']]));
         $this->expectException(ExpectationFailedException::class);
         $request->assertHasHeader('header', 'value');
     }
@@ -52,7 +52,7 @@ public function assert_has_header_succeeds_when_the_header_with_the_specified_va
      */
     public function assert_not_has_header_fails_when_the_header_exists()
     {
-        $request = new Request(new GuzzleRequest('get', '/test', ['header' => []]));
+        $request = new Request(new GuzzleRequest('get', '/test', ['header' => ['value']]));
         $this->expectException(ExpectationFailedException::class);
         $request->assertNotHasHeader('header');
     }
@@ -81,7 +81,7 @@ public function assert_not_has_header_fails_when_the_header_with_the_specified_v
      */
     public function assert_not_has_header_succeeds_when_the_header_with_the_specified_value_does_not_exist()
     {
-        $request = new Request(new GuzzleRequest('get', '/test', ['header' => []]));
+        $request = new Request(new GuzzleRequest('get', '/test', ['header' => ['notValue']]));
         $request->assertNotHasHeader('header', 'value');
     }
 

From 3e2216089615b88581234ade22322832f6182221 Mon Sep 17 00:00:00 2001
From: JaskirtPooni <jaskirt@soapboxhq.com>
Date: Wed, 15 Jan 2020 16:08:54 -0500
Subject: [PATCH 2/5] Added laravel 6 support

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

diff --git a/composer.json b/composer.json
index 43a1e60..aa908d5 100644
--- a/composer.json
+++ b/composer.json
@@ -10,12 +10,12 @@
     ],
     "require": {
         "guzzlehttp/guzzle": "^6.3",
-        "illuminate/support": "^5.4",
+        "illuminate/support": "^6.0",
         "phpunit/phpunit": "~6.0|~7.0|~8.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.0",
-        "orchestra/testbench": "^3.4",
+        "orchestra/testbench": "^4.0",
         "satooshi/php-coveralls": "^1.0"
     },
     "autoload": {

From 5c0d7eac5cd0bde131abcfcf44f7044133d7026e Mon Sep 17 00:00:00 2001
From: JaskirtPooni <jaskirt@soapboxhq.com>
Date: Wed, 15 Jan 2020 17:05:34 -0500
Subject: [PATCH 3/5] Updated phpunit version

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

diff --git a/composer.json b/composer.json
index aa908d5..3a14474 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "require": {
         "guzzlehttp/guzzle": "^6.3",
         "illuminate/support": "^6.0",
-        "phpunit/phpunit": "~6.0|~7.0|~8.0"
+        "phpunit/phpunit": "~8.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.0",

From f6e6be00a5423dcdd849b8bed0a44fc466035a43 Mon Sep 17 00:00:00 2001
From: JaskirtPooni <jaskirt@soapboxhq.com>
Date: Wed, 15 Jan 2020 17:06:23 -0500
Subject: [PATCH 4/5] Remove unsupported php versions

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9eb80e..9444d31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,6 @@ language: php
 
 matrix:
   include:
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.7.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.8.*
     - php: 7.2
       env: ILLUMINATE_VERSION=5.7.*
     - php: 7.2

From 1760c195a3f799703e5440574ec7b6a4cade2070 Mon Sep 17 00:00:00 2001
From: JaskirtPooni <jaskirt@soapboxhq.com>
Date: Wed, 15 Jan 2020 21:05:36 -0500
Subject: [PATCH 5/5] Removed matrix

---
 .travis.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9444d31..7a6eaf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,9 @@
 language: php
 
-matrix:
-  include:
-    - php: 7.2
-      env: ILLUMINATE_VERSION=5.7.*
-    - php: 7.2
-      env: ILLUMINATE_VERSION=5.8.*
-    - php: 7.3
-      env: ILLUMINATE_VERSION=5.7.*
-    - php: 7.3
-      env: ILLUMINATE_VERSION=5.8.*
+php:
+  - 7.2
+  - 7.3
+  - 7.4
 
 script:
   - composer install