mirror of
https://github.com/codeigniter4/CodeIgniter4.git
synced 2025-02-20 11:44:28 +08:00
Update TravisCI config for PHP7.4
This commit is contained in:
parent
8597be3a52
commit
b32c55a39c
@ -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
|
||||
|
||||
|
@ -239,7 +239,7 @@ class FileLocator
|
||||
|
||||
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 @@ class FileLocator
|
||||
$namespaces = [];
|
||||
|
||||
// Save system for last
|
||||
$system = null;
|
||||
$system = [];
|
||||
|
||||
foreach ($this->autoloader->getNamespace() as $prefix => $paths)
|
||||
{
|
||||
|
@ -182,8 +182,9 @@ class UploadedFile extends File implements UploadedFileInterface
|
||||
}
|
||||
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());
|
||||
|
Loading…
x
Reference in New Issue
Block a user