Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit c7fa320bd77e · 2021-07-21T11:14:51.000+02:00
* 5.2:
  [Mailer] better handling of HttpClient's DecodingExceptionInterface
  phpdoc fixes
  Fixes missing translations for Dutch (nl)
  [Security][Validator] Add missing Persian translations (fa)
  [Mailer] Make sure Http TransportException is not leaking
  * wrong trans-unit ids
  [Translator] fix fallback to Locale::getDefault()
diff --git a/Command/Command.php b/Command/Command.php
@@ -508,7 +508,7 @@ public function getName()
      * @param bool $hidden Whether or not the command should be hidden from the list of commands
      *                     The default value will be true in Symfony 6.0
      *
-     * @return Command The current instance
+     * @return $this
      *
      * @final since Symfony 5.1
      */
diff --git a/Helper/QuestionHelper.php b/Helper/QuestionHelper.php
@@ -504,7 +504,7 @@ private function isInteractiveInput($inputStream): bool
      * @param resource $inputStream The handler resource
      * @param Question $question    The question being asked
      *
-     * @return string|bool The input received, false in case input could not be read
+     * @return string|false The input received, false in case input could not be read
      */
     private function readInput($inputStream, Question $question)
     {

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ public function getName()`
`508`	`508`	`* @param bool $hidden Whether or not the command should be hidden from the list of commands`
`509`	`509`	`* The default value will be true in Symfony 6.0`
`510`	`510`	`*`
`511`		`- * @return Command The current instance`
	`511`	`+ * @return $this`
`512`	`512`	`*`
`513`	`513`	`* @final since Symfony 5.1`
`514`	`514`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ private function isInteractiveInput($inputStream): bool`
`504`	`504`	`* @param resource $inputStream The handler resource`
`505`	`505`	`* @param Question $question The question being asked`
`506`	`506`	`*`
`507`		`- * @return string\|bool The input received, false in case input could not be read`
	`507`	`+ * @return string\|false The input received, false in case input could not be read`
`508`	`508`	`*/`
`509`	`509`	`private function readInput($inputStream, Question $question)`
`510`	`510`	`{`