Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 1eb694994de7 · 2021-07-21T11:14:20.000+02:00
* 4.4:
  [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/Envelope.php b/Envelope.php
@@ -49,7 +49,7 @@ public static function wrap(object $message, array $stamps = []): self
     }
 
     /**
-     * @return Envelope a new Envelope instance with additional stamp
+     * @return static A new Envelope instance with additional stamp
      */
     public function with(StampInterface ...$stamps): self
     {
@@ -63,7 +63,7 @@ public function with(StampInterface ...$stamps): self
     }
 
     /**
-     * @return Envelope a new Envelope instance without any stamps of the given class
+     * @return static A new Envelope instance without any stamps of the given class
      */
     public function withoutAll(string $stampFqcn): self
     {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static function wrap(object $message, array $stamps = []): self`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * @return Envelope a new Envelope instance with additional stamp`
	`52`	`+ * @return static A new Envelope instance with additional stamp`
`53`	`53`	`*/`
`54`	`54`	`public function with(StampInterface ...$stamps): self`
`55`	`55`	`{`
`@@ -63,7 +63,7 @@ public function with(StampInterface ...$stamps): self`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * @return Envelope a new Envelope instance without any stamps of the given class`
	`66`	`+ * @return static A new Envelope instance without any stamps of the given class`
`67`	`67`	`*/`
`68`	`68`	`public function withoutAll(string $stampFqcn): self`
`69`	`69`	`{`