Skip to content

Commit 1c0887e

Browse files
committed
MC-18332: Remove MySQL Search Engine
- fixing tests - deprecating proxy
1 parent f0392f1 commit 1c0887e

File tree

10 files changed

+354
-625
lines changed

10 files changed

+354
-625
lines changed

app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*
1111
* @api
1212
* @since 100.2.0
13+
* @deprecated
14+
* @see \Magento\Elasticsearch
1315
*/
1416
interface IndexSwitcherInterface
1517
{

app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
/**
1313
* Proxy for adapter-specific index switcher
14+
* @deprecated
15+
* @see \Magento\Elasticsearch
1416
*/
1517
class IndexSwitcherProxy implements IndexSwitcherInterface
1618
{

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
134134
* @param \Magento\Customer\Model\Session $customerSession
135135
* @param \Magento\Framework\Stdlib\DateTime $dateTime
136136
* @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
137-
* @param \Magento\CatalogSearch\Model\Advanced\Request\Builder $requestBuilder
138-
* @param \Magento\Search\Model\SearchEngine $searchEngine
139137
* @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
140138
* @param SearchResultFactory|null $searchResultFactory
141139
* @param ProductLimitationFactory|null $productLimitationFactory
@@ -168,8 +166,6 @@ public function __construct(
168166
\Magento\Customer\Model\Session $customerSession,
169167
\Magento\Framework\Stdlib\DateTime $dateTime,
170168
\Magento\Customer\Api\GroupManagementInterface $groupManagement,
171-
\Magento\CatalogSearch\Model\Advanced\Request\Builder $requestBuilder,
172-
\Magento\Search\Model\SearchEngine $searchEngine,
173169
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
174170
SearchResultFactory $searchResultFactory = null,
175171
ProductLimitationFactory $productLimitationFactory = null,
@@ -181,8 +177,6 @@ public function __construct(
181177
EngineResolverInterface $engineResolver = null,
182178
DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null
183179
) {
184-
$this->requestBuilder = $requestBuilder;
185-
$this->searchEngine = $searchEngine;
186180
$this->searchRequestName = $searchRequestName;
187181
if ($searchResultFactory === null) {
188182
$this->searchResultFactory = \Magento\Framework\App\ObjectManager::getInstance()

app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class FulltextTest extends TestCase
6464

6565
protected function setUp(): void
6666
{
67+
$this->markTestSkipped("MC-18332: Mysql Search Engine is deprecated and will be removed");
6768
$this->fullAction = $this->getClassMock(Full::class);
6869
$fullActionFactory = $this->createPartialMock(
6970
FullFactory::class,

app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/IndexSwitcherProxyTest.php

Lines changed: 0 additions & 123 deletions
This file was deleted.

app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Scope/IndexSwitcherTest.php

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)