ACP2E-685: Product set to 'Not Visible Individually' still appear in Catalog Advanced Search Results

Author: dhorytskyi

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()

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

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+try {
+    $attribute = $attributeRepository->get('test_searchable_attribute');
+    $attributeRepository->delete($attribute);
+} catch (NoSuchEntityException $e) {
+    //Attribute already removed
+}
+$eavConfig = $objectManager->get(Config::class);
+$eavConfig->clear();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);