Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 0157ef677417 · 2023-02-13T11:14:31.000+01:00
* 6.2:
  Fix some phpdoc
  [ErrorHandler] Do not patch return statements in closures
  [DI] keep `proxy` tag on original definition when decorating
diff --git a/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -25,7 +25,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
      * Constructs a transformer.
      *
      * @param bool        $grouping     Whether thousands should be grouped
-     * @param int         $roundingMode One of the ROUND_ constants in this class
+     * @param int|null    $roundingMode One of the ROUND_ constants in this class
      * @param string|null $locale       locale used for transforming
      */
     public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN, string $locale = null)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo`
`25`	`25`	`* Constructs a transformer.`
`26`	`26`	`*`
`27`	`27`	`* @param bool $grouping Whether thousands should be grouped`
`28`		`- * @param int $roundingMode One of the ROUND_ constants in this class`
	`28`	`+ * @param int\|null $roundingMode One of the ROUND_ constants in this class`
`29`	`29`	`* @param string\|null $locale locale used for transforming`
`30`	`30`	`*/`
`31`	`31`	`public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN, string $locale = null)`