Specify default parameters in order to make the setState() call backwards compatible

David Freiman · David Freiman · commit ffda2ebabcfa · 2015-04-18T20:10:40.000-07:00
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
@@ -1159,7 +1159,7 @@ public function registerCancellation($comment = '', $graceful = true)
             $this->setTotalCanceled($this->getGrandTotal() - $this->getTotalPaid());
             $this->setBaseTotalCanceled($this->getBaseGrandTotal() - $this->getBaseTotalPaid());
 
-            $this->setState($cancelState, true, $comment);
+            $this->setState($cancelState, true, $comment, null, false);
         } elseif (!$graceful) {
             throw new \Magento\Framework\Exception\LocalizedException(__('We cannot cancel this order.'));
         }

Original file line number	Diff line number	Diff line change
`@@ -1159,7 +1159,7 @@ public function registerCancellation($comment = '', $graceful = true)`
`1159`	`1159`	`$this->setTotalCanceled($this->getGrandTotal() - $this->getTotalPaid());`
`1160`	`1160`	`$this->setBaseTotalCanceled($this->getBaseGrandTotal() - $this->getBaseTotalPaid());`
`1161`	`1161`
`1162`		`- $this->setState($cancelState, true, $comment);`
	`1162`	`+ $this->setState($cancelState, true, $comment, null, false);`
`1163`	`1163`	`} elseif (!$graceful) {`
`1164`	`1164`	`throw new \Magento\Framework\Exception\LocalizedException(__('We cannot cancel this order.'));`
`1165`	`1165`	`}`