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] 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';