Skip to content

Commit d380458

Browse files
Merge branch '3.4' into 4.4
* 3.4: [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 [VarDumper] Fix CliDumper coloration [DI] tighten detection of local dirs to prevent false positives [FrameworkBundle] preserve dots in query-string when redirecting bumped Symfony version to 3.4.43 updated VERSION for 3.4.42 update CONTRIBUTORS for 3.4.42 updated CHANGELOG for 3.4.42
2 parents 0f55791 + e0d43b6 commit d380458

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)