33589 change advanced search model and add test

Author: silinmykola

app/code/Magento/CatalogSearch/Model/Advanced.php

@@ -210,6 +210,12 @@ public function addFilters($values)
             $this->addSearchCriteria($attribute, $preparedSearchValue);
 
             if ($attribute->getAttributeCode() == 'price') {
+                foreach ($value as $key => $element) {
+                    if (is_array($element)) {
+                        $value[$key] = null;
+                    }
+                }
+
                 $rate = 1;
                 $store = $this->_storeManager->getStore();
                 $currency = $store->getCurrentCurrencyCode();
@@ -351,13 +357,15 @@ protected function addSearchCriteria($attribute, $value)
     /**
      * Add data about search criteria to object state
      *
-     * @todo: Move this code to block
-     *
      * @param EntityAttribute $attribute
      * @param mixed $value
+     *
      * @return string|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws LocalizedException
+     * @todo: Move this code to block
+     *
      */
     protected function getPreparedSearchCriteria($attribute, $value)
     {
@@ -368,13 +376,14 @@ protected function getPreparedSearchCriteria($attribute, $value)
                 if (!empty($value['from']) || !empty($value['to'])) {
                     $from = '';
                     $to = '';
-                    if (is_array($value['from'])) {
-                        $value['from'] = $this->getFirstArrayElement($value['from']);
-                    }
-                    if (is_array($value['to'])) {
-                        $value['to'] = $this->getFirstArrayElement($value['to']);
+
+                    foreach ($value as $key => $element) {
+                        if (is_array($element)) {
+                            $value[$key] = null;
+                        }
                     }
 
+
                     if (isset($value['currency'])) {
                         /** @var $currencyModel Currency */
                         $currencyModel = $this->_currencyFactory->create()->load($value['currency']);
@@ -440,16 +449,4 @@ public function getSearchCriterias()
     {
         return $this->_searchCriterias;
     }
-
-    /**
-     * Return first value in array
-     *
-     * @param $value
-     *
-     * @return mixed
-     */
-    private function getFirstArrayElement($value)
-    {
-        return is_array($value) ? $this->getFirstArrayElement(array_shift($value)) : $value;
-    }
 }

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php

@@ -134,6 +134,85 @@ public function testExecuteWithUnderscore(): void
         $this->assertStringContainsString('name_simple_product', $responseBody);
     }
 
+    /**
+     * Advanced search with array in price parameters
+     *
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     * @dataProvider searchParamsWithArrayDataProvider
+     *
+     * @param array $searchParams
+     * @return void
+     */
+    public function testExecuteWithArrayInParams(array $searchParams): void
+    {
+        $this->getRequest()->setQuery(
+            $this->_objectManager->create(
+                Parameters::class,
+                [
+                    'values' => $searchParams
+                ]
+            )
+        );
+        $this->dispatch('catalogsearch/advanced/result');
+        $this->assertEquals(200, $this->getResponse()->getStatusCode());
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertStringContainsString(
+            'We can\'t find any items matching these search criteria',
+            $responseBody
+        );
+    }
+
+    /**
+     * Data provider with arrays in param values
+     *
+     * @return array
+     */
+    public function searchParamsWithArrayDataProvider(): array
+    {
+        return [
+            'search_with_empty_arrays' => [
+                [
+                    'name' => '',
+                    'sku' => '',
+                    'description' => '',
+                    'short_description' => '',
+                    'price' => [
+                        'from' => [
+                            1
+                        ],
+                        'to' => 1,
+                    ]
+                ]
+            ],
+            'search_with_params_in_array' => [
+                [
+                    'name' => '',
+                    'sku' => '',
+                    'description' => '',
+                    'short_description' => '',
+                    'price' => [
+                        'from' => ['0' => 1],
+                        'to' => [1],
+                    ]
+                ]
+            ],
+            'search_with_params_in_array_in_array' => [
+                [
+                    'name' => '',
+                    'sku' => '',
+                    'description' => '',
+                    'short_description' => '',
+                    'price' => [
+                        ['from' => ['0' => 1]],
+                        ['to' => 1],
+                    ]
+                ]
+            ]
+        ];
+    }
+
     /**
      * Data provider with strings for quick search.
      *