Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  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
  • Loading branch information
derrabus committed Nov 14, 2023
2 parents 29e5826 + 1808e5f commit 8befdb3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Tests/UriResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ public static function provideResolverTests()

['foo', 'http://localhost?bar=1', 'http://localhost/foo'],
['foo', 'http://localhost#bar', 'http://localhost/foo'],

['foo:1', 'http://localhost', 'http://localhost/foo:1'],
['/bar:1', 'http://localhost', 'http://localhost/bar:1'],
['foo/bar:1', 'http://localhost', 'http://localhost/foo/bar:1'],
];
}
}
2 changes: 1 addition & 1 deletion UriResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static function resolve(string $uri, ?string $baseUri): string
$uri = trim($uri);

// absolute URL?
if (null !== parse_url($uri, \PHP_URL_SCHEME)) {
if (\is_string(parse_url($uri, \PHP_URL_SCHEME))) {
return $uri;
}

Expand Down

0 comments on commit 8befdb3

Please sign in to comment.