Merge remote-tracking branch 'origin/ENGCOM-5926-magento-magento2-24595' into 2.3-develop-express-lane-prs

Author: Stanislav Idolov

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

@@ -14,7 +14,7 @@
 use Magento\SalesRule\Model\Rule\Action\Discount\DataFactory;
 
 /**
- * Rules Applier Model
+ * Class RulesApplier
  *
  * @package Magento\SalesRule\Model\Validator
  */
@@ -65,7 +65,7 @@ public function __construct(
         $this->validatorUtility = $utility;
         $this->_eventManager = $eventManager;
         $this->childrenValidationLocator = $childrenValidationLocator
-            ?: ObjectManager::getInstance()->get(ChildrenValidationLocator::class);
+             ?: ObjectManager::getInstance()->get(ChildrenValidationLocator::class);
         $this->discountFactory = $discountDataFactory ?: ObjectManager::getInstance()->get(DataFactory::class);
     }
 
@@ -152,10 +152,10 @@ public function addDiscountDescription($address, $rule)
     }
 
     /**
-     * Apply rule
+     * Apply Rule
      *
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
-     * @param \Magento\SalesRule\Model\Rule $rule
+     * @param AbstractItem $item
+     * @param Rule $rule
      * @param \Magento\Quote\Model\Quote\Address $address
      * @param mixed $couponCode
      * @return $this
@@ -296,9 +296,9 @@ protected function eventFix(
     }
 
     /**
-     * Set Applied Rule ids
+     * Set Applied Rule Ids
      *
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
+     * @param AbstractItem $item
      * @param int[] $appliedRuleIds
      * @return $this
      */

app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php

@@ -231,19 +231,23 @@ public function dataProviderChildren()
      */
     protected function getPreparedItem()
     {
-        /** @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject $address */
+        /**
+         * @var Address|PHPUnit_Framework_MockObject_MockObject $address
+        */
         $address = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Address::class,
+            Address::class,
             [
                 'getQuote',
                 'setCouponCode',
                 'setAppliedRuleIds',
                 '__wakeup'
             ]
         );
-        /** @var \Magento\Quote\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        /**
+         * @var AbstractItem|PHPUnit_Framework_MockObject_MockObject $item
+        */
         $item = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Item::class,
+            Item::class,
             [
                 'setDiscountAmount',
                 'setBaseDiscountAmount',