Merge branch 'MAGETWO-82242' into MPI-PR-2.1-develop

viktym · viktym · commit 3f3e3c67b6bc · 2017-11-17T12:50:17.000+02:00
diff --git a/app/code/Magento/SalesRule/Model/DeltaPriceRound.php b/app/code/Magento/SalesRule/Model/DeltaPriceRound.php
@@ -68,7 +68,7 @@ public function resetAll()
      * @param string $type
      * @return void
      */
-    public function reset(string $type)
+    public function reset($type)
     {
         if (isset($this->roundingDeltas[$type])) {
             unset($this->roundingDeltas[$type]);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function resetAll()`
`68`	`68`	`* @param string $type`
`69`	`69`	`* @return void`
`70`	`70`	`*/`
`71`		`- public function reset(string $type)`
	`71`	`+ public function reset($type)`
`72`	`72`	`{`
`73`	`73`	`if (isset($this->roundingDeltas[$type])) {`
`74`	`74`	`unset($this->roundingDeltas[$type]);`