Merge pull request #8 from Soapbox/feature/add-laravel-6-support

[Feature] Add laravel 6 support
jshayes · Jan 16, 2020 · cd722ce · cd722ce
2 parents 6b9401e + 1760c19
commit cd722ce
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,9 @@
 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
-      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

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

diff --git 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');
     }