ENGCOM-5144: Simplify if else catalog search full text data provider #22965

Author: p-bystritsky

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php

@@ -573,11 +573,10 @@ public function prepareProductIndex($indexData, $productData, $storeId)
             foreach ($attributeData as $attributeId => $attributeValues) {
                 $value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);
                 if (!empty($value)) {
-                    if (isset($index[$attributeId])) {
-                        $index[$attributeId][$entityId] = $value;
-                    } else {
-                        $index[$attributeId] = [$entityId => $value];
+                    if (!isset($index[$attributeId])) {
+                        $index[$attributeId] = [];
                     }
+                        $index[$attributeId][$entityId] = $value;
                 }
             }
         }
@@ -645,9 +644,12 @@ private function getAttributeOptionValue($attributeId, $valueIds, $storeId)
                 $attribute->setStoreId($storeId);
                 $options = $attribute->getSource()->toOptionArray();
                 $this->attributeOptions[$optionKey] = array_column($options, 'label', 'value');
-                $this->attributeOptions[$optionKey] = array_map(function ($value) {
-                    return $this->filterAttributeValue($value);
-                }, $this->attributeOptions[$optionKey]);
+                $this->attributeOptions[$optionKey] = array_map(
+                    function ($value) {
+                        return $this->filterAttributeValue($value);
+                    },
+                    $this->attributeOptions[$optionKey]
+                );
             } else {
                 $this->attributeOptions[$optionKey] = null;
             }