From 37e4384a7cb18492c41ba568ee8a084255d753d4 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 23 Aug 2017 19:34:16 +0100
Subject: [PATCH 1/2] Test on laravel 5.5

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 79e722f..7264b2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,8 @@ matrix:
       env: LARAVEL_VERSION=5.3.*
     - php: 7.0
       env: LARAVEL_VERSION=5.4.*
+    - php: 7.0
+      env: LARAVEL_VERSION=5.5.*
     - php: 7.1
       env: LARAVEL_VERSION=5.1.*
     - php: 7.1
@@ -36,6 +38,8 @@ matrix:
       env: LARAVEL_VERSION=5.3.*
     - php: 7.1
       env: LARAVEL_VERSION=5.4.*
+    - php: 7.1
+      env: LARAVEL_VERSION=5.5.*
     - php: hhvm
       env: LARAVEL_VERSION=5.1.*
       dist: trusty
@@ -48,6 +52,9 @@ matrix:
     - php: hhvm
       env: LARAVEL_VERSION=5.4.*
       dist: trusty
+    - php: hhvm
+      env: LARAVEL_VERSION=5.5.*
+      dist: trusty
 
 before_install:
   - if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'hhvm.jit = false' >> /etc/hhvm/php.ini ; fi

From c014c4a4b329b6988e38752563c3b9779539265c Mon Sep 17 00:00:00 2001
From: Raza Mehdi <srmk@outlook.com>
Date: Thu, 24 Aug 2017 02:11:24 +0500
Subject: [PATCH 2/2] Fix tests for Laravel 5.5

---
 .gitignore                                      |  1 +
 .travis.yml                                     |  5 +----
 composer.json                                   |  4 ++--
 tests/Functional/AbstractFunctionalTestCase.php | 12 ------------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 81b9258..e39e94f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 composer.lock
 phpunit.xml
 vendor
+/.idea
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 7264b2d..69e7c44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,9 +52,6 @@ matrix:
     - php: hhvm
       env: LARAVEL_VERSION=5.4.*
       dist: trusty
-    - php: hhvm
-      env: LARAVEL_VERSION=5.5.*
-      dist: trusty
 
 before_install:
   - if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'hhvm.jit = false' >> /etc/hhvm/php.ini ; fi
@@ -64,4 +61,4 @@ before_install:
 install:
   - travis_retry composer install --no-suggest --prefer-dist -n -o
 
-script: vendor/bin/phpunit
+script: vendor/bin/phpunit
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 67a15a6..86a93e2 100644
--- a/composer.json
+++ b/composer.json
@@ -24,9 +24,9 @@
         "mrclay/minify": "^2.2"
     },
     "require-dev": {
-        "graham-campbell/testbench": "^3.1",
+        "graham-campbell/testbench": "^3.1|^4.0",
         "mockery/mockery": "^0.9.4",
-        "phpunit/phpunit": "^4.8|^5.0"
+        "phpunit/phpunit": "^4.8|^5.0|^6.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/Functional/AbstractFunctionalTestCase.php b/tests/Functional/AbstractFunctionalTestCase.php
index abd64cf..4f38b42 100644
--- a/tests/Functional/AbstractFunctionalTestCase.php
+++ b/tests/Functional/AbstractFunctionalTestCase.php
@@ -21,18 +21,6 @@
  */
 abstract class AbstractFunctionalTestCase extends AbstractTestCase
 {
-    /**
-     * @before
-     */
-    public function setUpStorage()
-    {
-        $files = glob(storage_path('framework/views/*'));
-
-        foreach ($files as $file) {
-            @unlink($file);
-        }
-    }
-
     /**
      * Normalise eol characters in a string.
      *