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

Author: dhorytskyi

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

@@ -110,6 +110,7 @@ public function getFieldName($attributeCode, $context = [])
      * @param array $context
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getAllAttributesTypes($context = [])
     {

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

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

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

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