Skip to content

Commit 1f9639f

Browse files
Merge branch '5.1'
* 5.1: (28 commits) [DI] fix Use "composer/package-versions-deprecated" when possible Fix Small update in our internal terminology Fix support for PHP8 union types [VarDumper] fix typo [Lock][Messenger] Fix precedence of DSN options for 5.1 Fix support for PHP8 union types [FrameworkBundle] preserve dots in query-string when redirecting [3.4] Fix support for PHP8 union types [PhpUnitBridge] Streamline ansi/no-ansi of composer according to phpunit --colors option [3.4] Small update in our internal terminology [Cache] fix compat with DBAL v3 Remove unnecessary null check [HttpFoundation] Allow `null` in InputBag@set [HttpClient] Convert CurlHttpClient::handlePush() to instance method Fix package rename when releasing bumped Symfony version to 5.1.3 updated VERSION for 5.1.2 updated CHANGELOG for 5.1.2 ...
2 parents cf4202a + 08c9a82 commit 1f9639f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Matcher/Dumper/CompiledUrlMatcherDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private function compileStaticRoutes(array $staticRoutes, array &$conditions): a
244244
* Last but not least:
245245
* - Because it is not possibe to mix unicode/non-unicode patterns in a single regexp, several of them can be generated.
246246
* - The same regexp can be used several times when the logic in the switch rejects the match. When this happens, the
247-
* matching-but-failing subpattern is blacklisted by replacing its name by "(*F)", which forces a failure-to-match.
247+
* matching-but-failing subpattern is excluded by replacing its name by "(*F)", which forces a failure-to-match.
248248
* To ease this backlisting operation, the name of subpatterns is also the string offset where the replacement should occur.
249249
*/
250250
private function compileDynamicRoutes(RouteCollection $collection, bool $matchHost, int $chunkLimit, array &$conditions): array

0 commit comments

Comments
 (0)