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:
  [Cache][Lock] Fix PDO store not creating table + add tests
  Closes #51936-Added Missing translations for Czech (cs) in validators.cs.xlf file
  Added missing translations in turkish and updated validators.tr.xlf
  [Serializer] Fix denormalizing date intervals having both weeks and days
  [Validator] updated Turkish translation
  [Serializer] Fix denormalize constructor arguments
  Add some more non-countable English nouns
  Add hint that changing input arguments has no effect
  [DomCrawler] Revert "bug #52579 UriResolver support path with colons"
  [VarExporter] Fix handling mangled property names returned by __sleep()
  Update Github template for 7.1
  • Loading branch information
nicolas-grekas committed Nov 20, 2023
2 parents 8befdb3 + b7065c1 commit 14ff4fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions Tests/UriResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ 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'],
['http://', 'http://localhost', 'http://'],
];
}
}
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 (\is_string(parse_url($uri, \PHP_URL_SCHEME))) {
if (null !== parse_url($uri, \PHP_URL_SCHEME)) {
return $uri;
}

Expand Down

0 comments on commit 14ff4fd

Please sign in to comment.