MAGETWO-39705: It's possible to specify discount more than 100% in Catalog Price Rule

Author: katmoon

app/code/Magento/CatalogRule/Model/Rule.php

@@ -350,19 +350,19 @@ protected function _getWebsitesMap()
     /**
      * {@inheritdoc}
      */
-    public function validateData(\Magento\Framework\Object $object)
+    public function validateData(\Magento\Framework\DataObject $dataObject)
     {
-        $result = parent::validateData($object);
+        $result = parent::validateData($dataObject);
         if ($result === true) {
             $result = [];
         }
 
-        $action = $object->getData('simple_action');
-        $discount = $object->getData('discount_amount');
+        $action = $dataObject->getData('simple_action');
+        $discount = $dataObject->getData('discount_amount');
         $result = array_merge($result, $this->validateDiscount($action, $discount));
-        if ($object->getData('sub_is_enable') == 1) {
-            $action = $object->getData('sub_simple_action');
-            $discount = $object->getData('sub_discount_amount');
+        if ($dataObject->getData('sub_is_enable') == 1) {
+            $action = $dataObject->getData('sub_simple_action');
+            $discount = $dataObject->getData('sub_discount_amount');
             $result = array_merge($result, $this->validateDiscount($action, $discount));
         }
 

app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php

@@ -216,7 +216,7 @@ public function dataProviderCallbackValidateProduct()
      */
     public function testValidateData($data, $expected)
     {
-        $result = $this->rule->validateData(new \Magento\Framework\Object($data));
+        $result = $this->rule->validateData(new \Magento\Framework\DataObject($data));
         $this->assertEquals($result, $expected);
     }
 

app/code/Magento/Rule/Model/AbstractModel.php

@@ -350,19 +350,19 @@ public function validate(\Magento\Framework\DataObject $object)
     /**
      * Validate rule data
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param \Magento\Framework\DataObject $dataObject
      * @return bool|string[] - return true if validation passed successfully. Array with errors description otherwise
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function validateData(\Magento\Framework\DataObject $object)
+    public function validateData(\Magento\Framework\DataObject $dataObject)
     {
         $result = [];
         $fromDate = $toDate = null;
 
-        if ($object->hasFromDate() && $object->hasToDate()) {
-            $fromDate = $object->getFromDate();
-            $toDate = $object->getToDate();
+        if ($dataObject->hasFromDate() && $dataObject->hasToDate()) {
+            $fromDate = $dataObject->getFromDate();
+            $toDate = $dataObject->getToDate();
         }
 
         if ($fromDate && $toDate) {
@@ -374,14 +374,14 @@ public function validateData(\Magento\Framework\DataObject $object)
             }
         }
 
-        if ($object->hasWebsiteIds()) {
-            $websiteIds = $object->getWebsiteIds();
+        if ($dataObject->hasWebsiteIds()) {
+            $websiteIds = $dataObject->getWebsiteIds();
             if (empty($websiteIds)) {
                 $result[] = __('Please specify a website.');
             }
         }
-        if ($object->hasCustomerGroupIds()) {
-            $customerGroupIds = $object->getCustomerGroupIds();
+        if ($dataObject->hasCustomerGroupIds()) {
+            $customerGroupIds = $dataObject->getCustomerGroupIds();
             if (empty($customerGroupIds)) {
                 $result[] = __('Please specify Customer Groups.');
             }