From 4af40e23bb39f4008f3cfe66fd7a9baa48e808d8 Mon Sep 17 00:00:00 2001
From: freshleafmedia <10062339+freshleafmedia@users.noreply.github.com>
Date: Thu, 12 Nov 2020 17:22:52 +0000
Subject: [PATCH 1/6] Adds PHP 7.4 to the Travis build

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

diff --git a/.travis.yml b/.travis.yml
index de890615..9fc3fdee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
   - nightly
   - hhvm
 

From 8bc2946a7d01a131bdaec20670d01212d9981484 Mon Sep 17 00:00:00 2001
From: freshleafmedia <10062339+freshleafmedia@users.noreply.github.com>
Date: Mon, 16 Nov 2020 09:59:56 +0000
Subject: [PATCH 2/6] Updates the distribution to Xenial to get PHP7.4 GD
 extension working

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9fc3fdee..05ead671 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: php
 
 sudo: false
 
-dist: trusty
+dist: xenial
 
 php:
   - 5.4

From 8283c144a65be60330494f82cba83c680d716c72 Mon Sep 17 00:00:00 2001
From: freshleafmedia <10062339+freshleafmedia@users.noreply.github.com>
Date: Mon, 16 Nov 2020 10:23:01 +0000
Subject: [PATCH 3/6] Updates Travis to use compatible OSes

---
 .travis.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 05ead671..5e792b9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,22 @@ language: php
 
 sudo: false
 
-dist: xenial
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-  - nightly
-  - hhvm
+jobs:
+  include:
+  - dist: trusty
+    php:
+    - 5.4
+    - 5.5
+  - dist: xenial
+    php:
+    - 5.6
+    - 7.0
+    - 7.1
+    - 7.2
+    - 7.3
+    - 7.4
+    - nightly
+    - hhvm
 
 matrix:
     allow_failures:

From f10307f99f8250b9bf10dffd3bd9cff753932076 Mon Sep 17 00:00:00 2001
From: freshleafmedia <10062339+freshleafmedia@users.noreply.github.com>
Date: Mon, 16 Nov 2020 13:41:31 +0000
Subject: [PATCH 4/6] Fixes matrix key

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5e792b9a..e7bee7e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,9 @@ jobs:
     - 7.4
     - nightly
     - hhvm
-
-matrix:
-    allow_failures:
-        - php: nightly
-        - php: hhvm
+  allow_failures:
+    - php: nightly
+    - php: hhvm
 
 before_script:
   - printf "\n" | pecl install imagick

From d435098e6ed251c697fa55cd6ac53aff5307dbab Mon Sep 17 00:00:00 2001
From: freshleafmedia <10062339+freshleafmedia@users.noreply.github.com>
Date: Mon, 16 Nov 2020 13:43:50 +0000
Subject: [PATCH 5/6] Expands all jobs

---
 .travis.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e7bee7e1..86ddce95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,19 +5,25 @@ sudo: false
 jobs:
   include:
   - dist: trusty
-    php:
-    - 5.4
-    - 5.5
+    php: 5.4
+  - dist: trusty
+    php: 5.5
   - dist: xenial
-    php:
-    - 5.6
-    - 7.0
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-    - nightly
-    - hhvm
+    php: 5.6
+  - dist: xenial
+    php: 7.0
+  - dist: xenial
+    php: 7.1
+  - dist: xenial
+    php: 7.2
+  - dist: xenial
+    php: 7.3
+  - dist: xenial
+    php: 7.4
+  - dist: xenial
+    php: nightly
+  - dist: xenial
+    php: hhvm
   allow_failures:
     - php: nightly
     - php: hhvm

From f9a78a2ea40b66321483631bd67c8e70d7a51cea Mon Sep 17 00:00:00 2001
From: freshleafmedia <10062339+freshleafmedia@users.noreply.github.com>
Date: Mon, 16 Nov 2020 14:12:31 +0000
Subject: [PATCH 6/6] Bumps the PHPUnit version to support PHP 7.4 and fixes
 test

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

diff --git a/composer.json b/composer.json
index d7df4a23..1e2b6673 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "guzzlehttp/psr7": "~1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.7",
+        "phpunit/phpunit": "^4.8 || ^5.7 || ^7.5.15",
         "mockery/mockery": "~0.9.2"
     },
     "suggest": {
diff --git a/tests/FileTest.php b/tests/FileTest.php
index 820a18af..e1c01fd2 100644
--- a/tests/FileTest.php
+++ b/tests/FileTest.php
@@ -19,7 +19,7 @@ class FileTest extends TestCase
     public function testBasePath()
     {
         $file = new File;
-        $this->assertNull(null, $file->basePath());
+        $this->assertNull(null, $file->basePath() ?: '');
 
         $file->dirname = 'foo';
         $file->basename = 'bar';