Skip to content

Commit af1ecc6

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Security][WIP] Add authenticators info to the profiler [Translation] Use symfony default locale when pulling translations from providers added missing translations for Bosnian (bs) Add the missing greek translations for security core and validator component [HttpKernel] Fix return types in `EventDataCollector` Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1 [Security][Validator] Add missing translations for Slovenian (sl) [Messenger] Add worker metadata inside logs [Messenger] Log when worker should stop and when `SIGTERM` is received cs fix [Security][Validator] Add missing translations for Finnish (fi) [VarDumper] returns a 500 when dd() is executed chore(VarDumper): declare that dd() never returns [MonologBridge] Deprecate the Swiftmailer handler [Cache] Commit items implicitly only when deferred keys are requested [MonologBridge] Deprecates ResetLoggersWorkerSubscriber Fix "can not" spelling [HttpClient] fix missing kernel.reset tag on TraceableHttpClient services [Form] Fix ChoiceType Extension to effectively set and use the translator Added new CssColor constraint
2 parents 44eb29d + 5a54b92 commit af1ecc6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Matcher/RequestMatcherInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interface RequestMatcherInterface
2626
/**
2727
* Tries to match a request with a set of routes.
2828
*
29-
* If the matcher can not find information, it must throw one of the exceptions documented
29+
* If the matcher cannot find information, it must throw one of the exceptions documented
3030
* below.
3131
*
3232
* @throws NoConfigurationException If no routing configuration could be found

Matcher/UrlMatcherInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interface UrlMatcherInterface extends RequestContextAwareInterface
2626
/**
2727
* Tries to match a URL path with a set of routes.
2828
*
29-
* If the matcher can not find information, it must throw one of the exceptions documented
29+
* If the matcher cannot find information, it must throw one of the exceptions documented
3030
* below.
3131
*
3232
* @param string $pathinfo The path info to be parsed (raw format, i.e. not urldecoded)

0 commit comments

Comments
 (0)