Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit 87ca33c807bc · 2018-06-22T10:59:57.000+02:00
* 4.1:
  [minor] SCA
  [Serializer] Minor tweaks for a67b650f12e5252a5d30c4c94576d73e15f19aef
  allow_extra_attributes does not throw an exception as documented
  [Cache] fix visibility of RedisTrait::init()
  [Serializer] Updates DocBlock to a mixed param type
diff --git a/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -28,10 +28,6 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
      */
     public function __construct(?int $scale = 0, ?bool $grouping = false, int $roundingMode = self::ROUND_DOWN)
     {
-        if (null === $roundingMode) {
-            $roundingMode = self::ROUND_DOWN;
-        }
-
         parent::__construct(0, $grouping, $roundingMode);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,6 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo`
`28`	`28`	`*/`
`29`	`29`	`public function __construct(?int $scale = 0, ?bool $grouping = false, int $roundingMode = self::ROUND_DOWN)`
`30`	`30`	`{`
`31`		`- if (null === $roundingMode) {`
`32`		`- $roundingMode = self::ROUND_DOWN;`
`33`		`- }`
`34`		`-`
`35`	`31`	`parent::__construct(0, $grouping, $roundingMode);`
`36`	`32`	`}`
`37`	`33`