Merge pull request #2537 from musmanikram/2465-add-php7.4

Update TravisCI config for PHP7.4
codeigniter4 · Feb 11, 2020 · e186885 · e186885
2 parents 0fe4dc7 + b32c55a
commit e186885
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4
   - nightly
 
 matrix:
@@ -16,7 +17,7 @@ global:
 
 # Recommended by Travis support
 sudo: required
-dist: trusty
+dist: xenial
 group: edge
 
 env:
@@ -30,6 +31,10 @@ services:
   - postgresql
   - redis-server
 
+cache:
+  directories:
+    - vendor
+
 script:
   - php vendor/bin/phpunit -v
 

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -239,7 +239,7 @@ public function search(string $path, string $ext = 'php'): array
 
 		foreach ($this->getNamespaces() as $namespace)
 		{
-			if (is_file($namespace['path'] . $path))
+			if (isset($namespace['path']) && is_file($namespace['path'] . $path))
 			{
 				$foundPaths[] = $namespace['path'] . $path;
 			}
@@ -288,7 +288,7 @@ protected function getNamespaces()
 		$namespaces = [];
 
 		// Save system for last
-		$system = null;
+		$system = [];
 
 		foreach ($this->autoloader->getNamespace() as $prefix => $paths)
 		{

diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
@@ -182,8 +182,9 @@ public function move(string $targetPath, string $name = null, bool $overwrite =
 		}
 		catch (Exception $e)
 		{
-			$error = error_get_last();
-			throw HTTPException::forMoveFailed(basename($this->path), $targetPath, strip_tags($error['message']));
+			$error   = error_get_last();
+			$message = isset($error['message']) ? strip_tags($error['message']) : '';
+			throw HTTPException::forMoveFailed(basename($this->path), $targetPath, $message);
 		}
 
 		@chmod($targetPath, 0777 & ~umask());