Skip to content

Add empty host and trailing slash to windows file paths #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phil-davis merged 3 commits into from
Aug 17, 2022
Merged

Add empty host and trailing slash to windows file paths #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cbd7f4
Add empty host and trailing slash to windows file paths
peterpostmann Oct 29, 2017
9d8d47f
Simplify regex for windows_path
phil-davis Aug 16, 2022
290c896
Handle file:///C: URI
phil-davis Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions lib/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,19 @@ function ($matches) {
$result = parse_url($uri);
if (!$result) {
$result = _parse_fallback($uri);
} else {
// Add empty host and trailing slash to Windows file paths
// file:///C:/path or file:///C:\path
// Note: the regex fragment [a-zA-Z]:[\/\\\\].* end up being
// [a-zA-Z]:[\/\\].*
// The 4 backslash in a row are the way to get 2 backslash into the actual string
// that is used as the regex. The 2 backslash are then the way to get 1 backslash
// character into the character set "a forward slash or a backslash"
if (isset($result['scheme']) && 'file' === $result['scheme'] && isset($result['path']) &&
preg_match('/^(?<windows_path> [a-zA-Z]:([\/\\\\].*)?)$/x', $result['path'])) {
$result['path'] = '/'.$result['path'];
$result['host'] = '';
}
}

return
Expand Down Expand Up @@ -341,15 +354,13 @@ function ($matches) {
$result['host'] = '';
} elseif ('//' === substr($uri, 0, 2)) {
// Uris that have an authority part.
$regex = '
%^
$regex = '%^
//
(?: (?<user> [^:@]+) (: (?<pass> [^@]+)) @)?
(?<host> ( [^:/]* | \[ [^\]]+ \] ))
(?: : (?<port> [0-9]+))?
(?<path> / .*)?
$%x
';
$%x';
if (!preg_match($regex, $uri, $matches)) {
throw new InvalidUriException('Invalid, or could not parse URI');
}
Expand Down
37 changes: 37 additions & 0 deletions tests/Uri/ParseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,43 @@ public function parseData(): array
'fragment' => null,
],
],
// Windows Paths
[
'file:///C:/path/file.ext',
[
'scheme' => 'file',
'host' => '',
'path' => '/C:/path/file.ext',
'port' => null,
'user' => null,
'query' => null,
'fragment' => null,
],
],
[
'file:///C:\path\file.ext',
[
'scheme' => 'file',
'host' => '',
'path' => '/C:\path\file.ext',
'port' => null,
'user' => null,
'query' => null,
'fragment' => null,
],
],
[
'file:///C:',
[
'scheme' => 'file',
'host' => '',
'path' => '/C:',
'port' => null,
'user' => null,
'query' => null,
'fragment' => null,
],
],
];
}
}
6 changes: 6 additions & 0 deletions tests/Uri/ResolveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ public function resolveData(): array
'0',
'http://example.org/0',
],
// Windows Paths
[
'file:///C:/path/file_a.ext',
'file_b.ext',
'file:///C:/path/file_b.ext',
],
];
}
}