Handle file:///C: URI

phil-davis · phil-davis · commit 290c89689f27 · 2022-08-16T21:05:51.000+05:45
diff --git a/lib/functions.php b/lib/functions.php
@@ -205,7 +205,7 @@ function ($matches) {
         // 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'])) {
+             preg_match('/^(?<windows_path> [a-zA-Z]:([\/\\\\].*)?)$/x', $result['path'])) {
             $result['path'] = '/'.$result['path'];
             $result['host'] = '';
         }
diff --git a/tests/Uri/ParseTest.php b/tests/Uri/ParseTest.php
@@ -250,6 +250,18 @@ public function parseData(): array
                     'fragment' => null,
                 ],
             ],
+            [
+                'file:///C:',
+                [
+                    'scheme' => 'file',
+                    'host' => '',
+                    'path' => '/C:',
+                    'port' => null,
+                    'user' => null,
+                    'query' => null,
+                    'fragment' => null,
+                ],
+            ],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ function ($matches) {`
`205`	`205`	`// that is used as the regex. The 2 backslash are then the way to get 1 backslash`
`206`	`206`	`// character into the character set "a forward slash or a backslash"`
`207`	`207`	`if (isset($result['scheme']) && 'file' === $result['scheme'] && isset($result['path']) &&`
`208`		`- preg_match('/^(?<windows_path> [a-zA-Z]:[\/\\\\].*)$/x', $result['path'])) {`
	`208`	`+ preg_match('/^(?<windows_path> [a-zA-Z]:([\/\\\\].*)?)$/x', $result['path'])) {`
`209`	`209`	`$result['path'] = '/'.$result['path'];`
`210`	`210`	`$result['host'] = '';`
`211`	`211`	`}`