Skip to content

Commit 273c5d9

Browse files
committed
Merge branch 'release/1.5.4'
2 parents 32d6fa9 + aaed678 commit 273c5d9

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# v1.5.4
2+
## 11/27/2020
3+
4+
1. [](#new)
5+
* Added PHP 8.0 support
6+
1. [](#bugfix)
7+
* Fixed `UniformResourceLocator::addPath()` with PHP 8
8+
19
# v1.5.3
210
## 11/23/2020
311

ResourceLocator/src/UniformResourceLocator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function addPath($scheme, $prefix, $paths, $override = false, $force = fa
129129
if (!$override || $override == 1) {
130130
$list = $override ? array_merge($paths, $list) : array_merge($list, $paths);
131131
} else {
132-
if (false !== strpos($override, '://')) {
132+
if (is_string($override) && false !== strpos($override, '://')) {
133133
// Support stream lookup in 'theme://path/to' format.
134134
$override = explode('://', $override, 2);
135135
$override[1] = trim($override[1], '/');

0 commit comments

Comments
 (0)