Skip to content

Commit dc373a5

Browse files
Merge branch '6.4' into 7.1
* 6.4: [Validator] Fix 58691 (missing plural-options in serbian language translation) profiler form data collector extart value property if it is setted [Process] Fix escaping /X arguments on Windows [Config] Handle Phar absolute path in `FileLocator` [Runtime] Remove unused `SKIPIF` from `dotenv_overload.phpt`
2 parents 5c61527 + 4e55e7e commit dc373a5

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

FileLocator.php

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ private function isAbsolutePath(string $file): bool
8787
&& ('\\' === $file[2] || '/' === $file[2])
8888
)
8989
|| parse_url($file, \PHP_URL_SCHEME)
90+
|| str_starts_with($file, 'phar:///') // "parse_url()" doesn't handle absolute phar path, despite being valid
9091
) {
9192
return true;
9293
}

Tests/FileLocatorTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public static function getIsAbsolutePathTests(): array
3838
['\\server\\foo.xml'],
3939
['https://server/foo.xml'],
4040
['phar://server/foo.xml'],
41+
['phar:///server/foo.xml'],
4142
];
4243
}
4344

0 commit comments

Comments
 (0)