[EngCom] Public Pull Requests - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

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

@@ -547,7 +547,7 @@ protected function _prepareCustomOptionPriceTable()
      * @param IndexTableStructure $finalPriceTable
      * @return void
      */
-    private function modifyPriceIndex(IndexTableStructure $finalPriceTable)
+    private function modifyPriceIndex(IndexTableStructure $finalPriceTable) : void
     {
         foreach ($this->priceModifiers as $priceModifier) {
             $priceModifier->modifyPrice($finalPriceTable);

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

@@ -36,7 +36,7 @@ public function __construct(Processor $priceIndexProcessor)
      * @return Item
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(Item $subject, Item $result, AbstractModel $model)
+    public function afterSave(Item $subject, Item $result, AbstractModel $model): Item
     {
         $fields = [
             'is_in_stock',
@@ -55,7 +55,7 @@ public function afterSave(Item $subject, Item $result, AbstractModel $model)
 
     /**
      * @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/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -571,6 +571,7 @@
                     <settings>
                         <scopeLabel>[GLOBAL]</scopeLabel>
                         <validation>
+                            <rule name="validate-integer" xsi:type="boolean">true</rule>
                             <rule name="validate-number" xsi:type="boolean">true</rule>
                         </validation>
                         <label translate="true">Qty Increments</label>

app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

@@ -20,7 +20,6 @@ define([
             var isDigits = value !== 1;
 
             this.validation['validate-integer'] = isDigits;
-            this.validation['validate-digits'] = isDigits;
             this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
             this.validate();
         }

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,8 +107,10 @@ public function getFieldName($attributeCode, $context = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @param array $context
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getAllAttributesTypes($context = [])
     {
@@ -173,8 +177,14 @@ protected function isAttributeUsedInAdvancedSearch($attribute)
      */
     protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode)
     {
-        return (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'integer')
-            ? $attributeCode . '_value' : $attributeCode;
+        switch ($frontendInput) {
+            case 'select':
+                return in_array($fieldType, ['text','integer'], true) ? $attributeCode . '_value' : $attributeCode;
+            case 'boolean':
+                return $fieldType === 'integer' ? $attributeCode . '_value' : $attributeCode;
+            default:
+                return $attributeCode;
+        }
     }
 
     /**

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 = [])
     {
@@ -115,4 +118,22 @@ public function getAllAttributesTypes($context = [])
 
         return $allAttributes;
     }
+
+    /**
+     * @param string $frontendInput
+     * @param string $fieldType
+     * @param string $attributeCode
+     * @return string
+     */
+    protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode)
+    {
+        switch ($frontendInput) {
+            case 'select':
+                return in_array($fieldType, ['string','integer'], true) ? $attributeCode . '_value' : $attributeCode;
+            case 'boolean':
+                return $fieldType === 'integer' ? $attributeCode . '_value' : $attributeCode;
+            default:
+                return $attributeCode;
+        }
+    }
 }

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 string $inputType
+     * @param array $searchAttributes
+     * @param array $expected
      * @return void
      */
     public function testGetAllAttributesTypes($attributeCode, $inputType, $searchAttributes, $expected)
@@ -227,17 +229,17 @@ public function testGetAllAttributesTypes($attributeCode, $inputType, $searchAtt
     public function attributeCodeProvider()
     {
         return [
-            ['id', 'id', 'string'],
-            ['status', 'status', 'string'],
-            ['status', 'status', 'string', ['type'=>'default']],
-            ['price', 'price_0_1', 'string', ['type'=>'default']],
-            ['position', 'position_category_1', 'string', ['type'=>'default']],
-            ['price', 'price_2_3', 'string', ['type'=>'default', 'customerGroupId'=>'2', 'websiteId'=>'3']],
-            ['position', 'position_category_3', 'string', ['type'=>'default', 'categoryId'=>'3']],
-            ['color', 'color', 'select', ['type'=>'default']],
-            ['description', 'sort_description', 'string', ['type'=>'some']],
-            ['*', '_all', 'string', ['type'=>'text']],
-            ['description', 'description', 'string', ['type'=>'text']],
+            ['id', 'id', 'text'],
+            ['status', 'status', 'text'],
+            ['status', 'status_value', 'text', ['type'=>'default']],
+            ['price', 'price_0_1', 'text', ['type'=>'default']],
+            ['position', 'position_category_1', 'text', ['type'=>'default']],
+            ['price', 'price_2_3', 'text', ['type'=>'default', 'customerGroupId'=>'2', 'websiteId'=>'3']],
+            ['position', 'position_category_3', 'text', ['type'=>'default', 'categoryId'=>'3']],
+            ['color', 'color_value', 'text', ['type'=>'text']],
+            ['description', 'sort_description', 'text', ['type'=>'some']],
+            ['*', '_all', 'text', ['type'=>'text']],
+            ['description', 'description_value', 'text', ['type'=>'text']],
         ];
     }