Merge branch 'ACP2E-685' of https://github.com/magento-l3/magento2ce into L3-PR-2022-04-19

Author: alzota

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

@@ -189,10 +189,8 @@ public function __construct(
         Advanced $advancedSearchResource = null
     ) {
         $this->searchRequestName = $searchRequestName;
-        if ($searchResultFactory === null) {
-            $this->searchResultFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Api\Search\SearchResultFactory::class);
-        }
+        $this->searchResultFactory = $searchResultFactory ?: ObjectManager::getInstance()
+            ->get(SearchResultFactory::class);
         $this->searchCriteriaResolverFactory = $searchCriteriaResolverFactory ?: ObjectManager::getInstance()
             ->get(SearchCriteriaResolverFactory::class);
         $this->searchResultApplierFactory = $searchResultApplierFactory ?: ObjectManager::getInstance()
@@ -241,7 +239,7 @@ public function __construct(
     public function addFieldsToFilter($fields)
     {
         if ($fields) {
-            $this->filters = array_merge($this->filters, $fields);
+            $this->filters = array_replace_recursive($this->filters, $fields);
         }
         return $this;
     }

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

@@ -65,6 +65,7 @@ public function testExecute(array $searchParams): void
         $this->dispatch('catalogsearch/advanced/result');
         $responseBody = $this->getResponse()->getBody();
         $this->assertStringContainsString('Simple product name', $responseBody);
+        $this->assertStringNotContainsString('Not visible simple product', $responseBody);
     }
 
     /**

dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search.php

@@ -27,6 +27,7 @@
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 /** @var ProductFactory $productFactory */
 $productFactory = $objectManager->get(ProductFactory::class);
+
 $product = $productFactory->create();
 $product->isObjectNew(true);
 $product->setTypeId(Type::TYPE_SIMPLE)
@@ -54,3 +55,31 @@
         ]
     );
 $productRepository->save($product);
+
+$product = $productFactory->create();
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Not visible simple product')
+    ->setSku('not_visible_simple')
+    ->setPrice(100)
+    ->setWeight(1)
+    ->setShortDescription('Product short description')
+    ->setTaxClassId(0)
+    ->setDescription('Product description')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setTestSearchableAttribute($attribute->getSource()->getOptionId('Option 1'))
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+        ]
+    );
+$productRepository->save($product);