Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history
* 5.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`
  • Loading branch information
nicolas-grekas committed Nov 4, 2024
2 parents 5ed4195 + 977c88a commit 4e55e7e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions FileLocator.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ private function isAbsolutePath(string $file): bool
&& ('\\' === $file[2] || '/' === $file[2])
)
|| parse_url($file, \PHP_URL_SCHEME)
|| str_starts_with($file, 'phar:///') // "parse_url()" doesn't handle absolute phar path, despite being valid
) {
return true;
}
Expand Down
1 change: 1 addition & 0 deletions Tests/FileLocatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public static function getIsAbsolutePathTests(): array
['\\server\\foo.xml'],
['https://server/foo.xml'],
['phar://server/foo.xml'],
['phar:///server/foo.xml'],
];
}

Expand Down

0 comments on commit 4e55e7e

Please sign in to comment.