Skip to content

Commit 06b7608

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Use extension_loaded call to check if pcntl extension is loaded, as SIGTERM might be set be swoole [DomCrawler] UriResolver support path with columns attach all required parameters to query Bump Symfony version to 6.3.9 Update VERSION for 6.3.8 Update CHANGELOG for 6.3.8 Bump Symfony version to 5.4.32 Update VERSION for 5.4.31 Update CONTRIBUTORS for 5.4.31 Update CHANGELOG for 5.4.31 Update VERSION for 4.4.51 Update CHANGELOG for 4.4.51 [Validator] updated Lithuanian translation
2 parents 043715b + 8befdb3 commit 06b7608

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Tests/UriResolverTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ public static function provideResolverTests()
8484

8585
['foo', 'http://localhost?bar=1', 'http://localhost/foo'],
8686
['foo', 'http://localhost#bar', 'http://localhost/foo'],
87+
88+
['foo:1', 'http://localhost', 'http://localhost/foo:1'],
89+
['/bar:1', 'http://localhost', 'http://localhost/bar:1'],
90+
['foo/bar:1', 'http://localhost', 'http://localhost/foo/bar:1'],
8791
];
8892
}
8993
}

UriResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static function resolve(string $uri, ?string $baseUri): string
3333
$uri = trim($uri);
3434

3535
// absolute URL?
36-
if (null !== parse_url($uri, \PHP_URL_SCHEME)) {
36+
if (\is_string(parse_url($uri, \PHP_URL_SCHEME))) {
3737
return $uri;
3838
}
3939

0 commit comments

Comments
 (0)