Skip to content

Commit 59cc509

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: fix compatibility with Twig 3.10 [Strings][EnglishInflector] Fix incorrect pluralisation of 'Album' handle union and intersection types for cascaded validations move wiring of the property info extractor to the ObjectNormalizer move Process component dep to require-dev Remove calls to `onConsecutiveCalls()` fix: remove unwanted type cast accept AbstractAsset instances when filtering schemas better distinguish URL schemes and windows drive letters convert empty CSV header names into numeric keys
2 parents 78dde75 + ca1c224 commit 59cc509

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Path.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ public static function isAbsolute(string $path): bool
365365
}
366366

367367
// Strip scheme
368-
if (false !== $schemeSeparatorPosition = strpos($path, '://')) {
368+
if (false !== ($schemeSeparatorPosition = strpos($path, '://')) && 1 !== $schemeSeparatorPosition) {
369369
$path = substr($path, $schemeSeparatorPosition + 3);
370370
}
371371

Tests/PathTest.php

+2
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,8 @@ public static function provideIsAbsolutePathTests(): \Generator
375375

376376
yield ['C:/css/style.css', true];
377377
yield ['D:/', true];
378+
yield ['C:///windows', true];
379+
yield ['C://test', true];
378380

379381
yield ['E:\\css\\style.css', true];
380382
yield ['F:\\', true];

composer.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
"require": {
1919
"php": ">=8.1",
2020
"symfony/polyfill-ctype": "~1.8",
21-
"symfony/polyfill-mbstring": "~1.8",
21+
"symfony/polyfill-mbstring": "~1.8"
22+
},
23+
"require-dev": {
2224
"symfony/process": "^5.4|^6.4"
2325
},
2426
"autoload": {

0 commit comments

Comments
 (0)