Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit 5aeac35c5542 · 2020-12-08T17:43:38.000+01:00
* 5.1: minor cs fix [Config][TwigBundle] Fixed syntax error in config [DI] Fix Xdebug 3.0 detection Use php8 stable [Notifier] Streamline changelogs of notifier bridges [Cache] fix checking for redis_sentinel support [Messenger] Fixed wording in php doc [Intl] Update the ICU data to 68.1 [FrameworkBundle] acces public-deprecated services via the private container to remove false-positive deprecations Remove unused @throws tags and handling of never thrown exceptions [PhpUnitBridge] Fix disabling DeprecationErrorHandler from phpunit configuration file
diff --git a/Exception/RecoverableExceptionInterface.php b/Exception/RecoverableExceptionInterface.php
@@ -15,7 +15,7 @@
  * Marker interface for exceptions to indicate that handling a message should have worked.
  *
  * If something goes wrong while handling a message that's received from a transport
- * and the message should must be retried, a handler can throw such an exception.
+ * and the message should be retried, a handler can throw such an exception.
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* Marker interface for exceptions to indicate that handling a message should have worked.`
`16`	`16`	`*`
`17`	`17`	`* If something goes wrong while handling a message that's received from a transport`
`18`		`- * and the message should must be retried, a handler can throw such an exception.`
	`18`	`+ * and the message should be retried, a handler can throw such an exception.`
`19`	`19`	`*`
`20`	`20`	`* @author Jérémy Derussé <jeremy@derusse.com>`
`21`	`21`	`*/`