Fix static tests.

magento · Mar 1, 2019 · e516ebc · e516ebc
1 parent 11e5397
commit e516ebc
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -160,7 +160,6 @@ public function setValidationFilter(
         Address $address = null
     ) {
         if (!$this->getFlag('validation_filter')) {
-
             $this->prepareSelect($websiteId, $customerGroupId, $now);
 
             $noCouponRules = $this->getNoCouponCodeSelect();
@@ -169,7 +168,7 @@ public function setValidationFilter(
                 $couponRules = $this->getCouponCodeSelect($couponCode);
 
                 $allAllowedRules = $this->getConnection()->select();
-                $allAllowedRules->union([$noCouponRules, $couponRules], \Zend_Db_Select::SQL_UNION_ALL);
+                $allAllowedRules->union([$noCouponRules, $couponRules], Select::SQL_UNION_ALL);
 
                 $wrapper = $this->getConnection()->select();
                 $wrapper->from($allAllowedRules);
@@ -189,9 +188,9 @@ public function setValidationFilter(
     /**
      * Recreate the default select object for specific needs of salesrule evaluation with coupon codes.
      *
-     * @param $websiteId
-     * @param $customerGroupId
-     * @param $now
+     * @param int $websiteId
+     * @param int $customerGroupId
+     * @param string $now
      */
     private function prepareSelect($websiteId, $customerGroupId, $now)
     {
@@ -223,7 +222,7 @@ private function getNoCouponCodeSelect()
     /**
      * Determine all active rules that are valid for the given coupon code.
      *
-     * @param $couponCode
+     * @param string $couponCode
      * @return Select
      */
     private function getCouponCodeSelect($couponCode)
@@ -260,7 +259,9 @@ private function getCouponCodeSelect($couponCode)
     }
 
     /**
-     * @param $couponCode
+     * Join coupong table to select.
+     *
+     * @param string $couponCode
      * @param Select $couponSelect
      */
     private function joinCouponTable($couponCode, Select $couponSelect)