diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b3ce5ca08..8b73a18b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 6 matrix: - phpVersions: ['7.1', '7.2', '7.3'] + phpVersions: ['7.1', '7.2', '7.3', '7.4'] fail-fast: false name: PHP ${{ matrix.phpVersions }} steps: diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php index bc5d1d6de..87a9d1d8f 100644 --- a/modules/system/classes/CombineAssets.php +++ b/modules/system/classes/CombineAssets.php @@ -428,7 +428,7 @@ class CombineAssets $filesSalt = null; foreach ($assets as $asset) { $filters = $this->getFilters(File::extension($asset)) ?: []; - $path = file_exists($asset) ? $asset : File::symbolizePath($asset, null) ?: $this->localPath . $asset; + $path = file_exists($asset) ? $asset : (File::symbolizePath($asset, null) ?: $this->localPath . $asset); $files[] = new FileAsset($path, $filters, public_path()); $filesSalt .= $this->localPath . $asset; } @@ -482,7 +482,7 @@ class CombineAssets $key = ''; $assetFiles = array_map(function ($file) { - return file_exists($file) ? $file : File::symbolizePath($file, null) ?: $this->localPath . $file; + return file_exists($file) ? $file : (File::symbolizePath($file, null) ?: $this->localPath . $file); }, $assets); foreach ($assetFiles as $file) {