Merge pull request #1055 from freshleafmedia/travis/php7.4

Adds PHP 7.4 to the Travis build

.travis.yml

@@ -2,23 +2,31 @@ language: php
 
 sudo: false
 
-dist: trusty
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - nightly
-  - hhvm
-
-matrix:
-    allow_failures:
-        - php: nightly
-        - php: hhvm
+jobs:
+  include:
+  - dist: trusty
+    php: 5.4
+  - dist: trusty
+    php: 5.5
+  - dist: xenial
+    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
 
 before_script:
   - printf "\n" | pecl install imagick

composer.json

@@ -17,7 +17,7 @@
         "guzzlehttp/psr7": "~1.1 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.7",
+        "phpunit/phpunit": "^4.8 || ^5.7 || ^7.5.15",
         "mockery/mockery": "~0.9.2"
     },
     "suggest": {

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