fix merge

xabbuh · xabbuh · commit 40fbaed8d423 · 2021-03-28T11:59:03.000+02:00
diff --git a/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -28,7 +28,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
      * @param int         $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)
+    public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN, ?string $locale = null)
     {
         parent::__construct(0, $grouping, $roundingMode, $locale);
     }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo`
`28`	`28`	`* @param int $roundingMode One of the ROUND_ constants in this class`
`29`	`29`	`* @param string\|null $locale locale used for transforming`
`30`	`30`	`*/`
`31`		`- public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN, ?string $locale)`
	`31`	`+ public function __construct(?bool $grouping = false, ?int $roundingMode = \NumberFormatter::ROUND_DOWN, ?string $locale = null)`
`32`	`32`	`{`
`33`	`33`	`parent::__construct(0, $grouping, $roundingMode, $locale);`
`34`	`34`	`}`