bug #54759 [Filesystem] better distinguish URL schemes and Windows drive letters (xabbuh)

fabpot · fabpot · commit 6be16adb943a · 2024-05-01T15:47:18.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Filesystem] better distinguish URL schemes and Windows drive letters | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #45485 | License | MIT Commits ------- f456e75 better distinguish URL schemes and windows drive letters
diff --git a/src/Symfony/Component/Filesystem/Path.php b/src/Symfony/Component/Filesystem/Path.php
@@ -368,7 +368,7 @@ public static function isAbsolute(string $path): bool
         }
 
         // Strip scheme
-        if (false !== $schemeSeparatorPosition = strpos($path, '://')) {
+        if (false !== ($schemeSeparatorPosition = strpos($path, '://')) && 1 !== $schemeSeparatorPosition) {
             $path = substr($path, $schemeSeparatorPosition + 3);
         }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/PathTest.php b/src/Symfony/Component/Filesystem/Tests/PathTest.php
@@ -375,6 +375,8 @@ public static function provideIsAbsolutePathTests(): \Generator
 
         yield ['C:/css/style.css', true];
         yield ['D:/', true];
+        yield ['C:///windows', true];
+        yield ['C://test', true];
 
         yield ['E:\\css\\style.css', true];
         yield ['F:\\', true];

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ public static function isAbsolute(string $path): bool`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`// Strip scheme`
`371`		`- if (false !== $schemeSeparatorPosition = strpos($path, '://')) {`
	`371`	`+ if (false !== ($schemeSeparatorPosition = strpos($path, '://')) && 1 !== $schemeSeparatorPosition) {`
`372`	`372`	`$path = substr($path, $schemeSeparatorPosition + 3);`
`373`	`373`	`}`
`374`	`374`