cleanup code

Author: engcom-Echo

app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php

@@ -3,19 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\SalesRule\Model\Rule;
+
 class BuyXGetY extends AbstractDiscount
 {
     /**
-     * @param \Magento\SalesRule\Model\Rule $rule
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
+     * Calculate discount data for BuyXGetY action.
+     *
+     * @param Rule $rule
+     * @param AbstractItem $item
      * @param float $qty
-     * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
+     * @return Data
      */
-    public function calculate($rule, $item, $qty)
+    public function calculate($rule, $item, $qty): Data
     {
-        /** @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData */
         $discountData = $this->discountFactory->create();
 
         $itemPrice = $this->validator->getItemPrice($item);

app/code/Magento/SalesRule/Model/Validator.php

@@ -387,8 +387,8 @@ public function processShippingAmount(Address $address)
                     $address->setCartFixedRules($cartRules);
                     break;
                 case Rule::BUY_X_GET_Y_ACTION:
-                    $qty = $this->getDiscountQtyAllItemsBuyXGetYAction($quote, $rule);
-                    $quoteAmount = $address->getBaseShippingAmount() / $quote->getItemsQty() * $qty;
+                    $allQtyDiscount = $this->getDiscountQtyAllItemsBuyXGetYAction($quote, $rule);
+                    $quoteAmount = $address->getBaseShippingAmount() / $quote->getItemsQty() * $allQtyDiscount;
                     $discountAmount = $this->priceCurrency->convert($quoteAmount, $quote->getStore());
                     $baseDiscountAmount = $quoteAmount;
                     break;
@@ -495,25 +495,25 @@ private function isValidItemForRule(AbstractItem $item, Rule $rule)
      * @param Rule $rule
      * @return float
      */
-    private function getDiscountQtyAllItemsBuyXGetYAction($quote, $rule)
+    private function getDiscountQtyAllItemsBuyXGetYAction(Quote $quote, Rule $rule): float
     {
         $discountAllQty = 0;
         foreach ($quote->getItems() as $item) {
             $qty = $item->getQty();
 
-            $x = $rule->getDiscountStep();
-            $y = $rule->getDiscountAmount();
-            if (!$x || $y > $x) {
+            $discountStep = $rule->getDiscountStep();
+            $discountAmount = $rule->getDiscountAmount();
+            if (!$discountStep || $discountAmount > $discountStep) {
                 continue;
             }
-            $buyAndDiscountQty = $x + $y;
+            $buyAndDiscountQty = $discountStep + $discountAmount;
 
             $fullRuleQtyPeriod = floor($qty / $buyAndDiscountQty);
             $freeQty = $qty - $fullRuleQtyPeriod * $buyAndDiscountQty;
 
-            $discountQty = $fullRuleQtyPeriod * $y;
-            if ($freeQty > $x) {
-                $discountQty += $freeQty - $x;
+            $discountQty = $fullRuleQtyPeriod * $discountAmount;
+            if ($freeQty > $discountStep) {
+                $discountQty += $freeQty - $discountStep;
             }
 
             $discountAllQty += $discountQty;