MAGETWO-91512: Free Shipping Cart Price Rule not working when UPS shipping method is enabled

Author: dhorytskyi

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

@@ -862,6 +862,11 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
         );
     }
 
+    /**
+     * @param string $tableAlias
+     * @param \Zend_Db_Expr $priceExpression
+     * @return \Zend_Db_Expr
+     */
     private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression)
     {
         return $this->getConnection()->getCheckSql(

app/code/Magento/CatalogInventory/Model/Plugin/PriceIndexUpdater.php

@@ -55,7 +55,7 @@ public function afterSave(Item $subject, Item $result, AbstractModel $model): It
 
     /**
      * @param Item $subject
-     * @param $result
+     * @param mixed $result
      * @param int $websiteId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -67,7 +67,7 @@ public function afterUpdateSetOutOfStock(Item $subject, $result, int $websiteId)
 
     /**
      * @param Item $subject
-     * @param $result
+     * @param mixed $result
      * @param int $websiteId
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php

@@ -69,7 +69,9 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @param string $attributeCode
+     * @param array $context
+     * @return string
      */
     public function getFieldName($attributeCode, $context = [])
     {
@@ -105,7 +107,8 @@ public function getFieldName($attributeCode, $context = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @param array $context
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getAllAttributesTypes($context = [])

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php

@@ -42,7 +42,9 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @param string $attributeCode
+     * @param array $context
+     * @return string
      */
     public function getFieldName($attributeCode, $context = [])
     {
@@ -78,7 +80,8 @@ public function getFieldName($attributeCode, $context = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @param array $context
+     * @return array
      */
     public function getAllAttributesTypes($context = [])
     {

app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php

@@ -180,7 +180,9 @@ public function testGetFieldNameWithoutAttribute()
     /**
      * @dataProvider attributeProvider
      * @param string $attributeCode
-     *
+     * @param $inputType
+     * @param $searchAttributes
+     * @param $expected
      * @return void
      */
     public function testGetAllAttributesTypes($attributeCode, $inputType, $searchAttributes, $expected)

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php

@@ -29,19 +29,28 @@ class ProductPriceTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->_model = Bootstrap::getObjectManager()->create(Product::class);
         $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
     }
 
+    /**
+     * @return void
+     */
     public function testGetPrice()
     {
         $this->assertEmpty($this->_model->getPrice());
         $this->_model->setPrice(10.0);
         $this->assertEquals(10.0, $this->_model->getPrice());
     }
 
+    /**
+     * @return void
+     */
     public function testGetPriceModel()
     {
         $default = $this->_model->getPriceModel();
@@ -73,6 +82,9 @@ public function testGetFormatedPrice()
         $this->assertEquals('<span class="price">$0.00</span>', $this->_model->getFormatedPrice());
     }
 
+    /**
+     * @return void
+     */
     public function testSetGetFinalPrice()
     {
         $this->assertEquals(0, $this->_model->getFinalPrice());

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -15,11 +15,17 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
      */
     private $carrier;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class);
     }
 
+    /**
+     * @return void
+     */
     public function testGetShipAcceptUrl()
     {
         $this->assertEquals('https://wwwcie.ups.com/ups.app/xml/ShipAccept', $this->carrier->getShipAcceptUrl());
@@ -35,6 +41,9 @@ public function testGetShipAcceptUrlLive()
         $this->assertEquals('https://onlinetools.ups.com/ups.app/xml/ShipAccept', $this->carrier->getShipAcceptUrl());
     }
 
+    /**
+     * @return void
+     */
     public function testGetShipConfirmUrl()
     {
         $this->assertEquals('https://wwwcie.ups.com/ups.app/xml/ShipConfirm', $this->carrier->getShipConfirmUrl());