Skip to content

Commit 068d9af

Browse files
author
Joan He
committed
Merge remote-tracking branch 'owls/MAGETWO-93994-deprecate-mysql-fts' into BugFixPR
2 parents 58b312e + 06a4cc2 commit 068d9af

File tree

110 files changed

+359
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+359
-8
lines changed

app/code/Magento/CatalogSearch/Block/Advanced/Form.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/**
2424
* @api
2525
* @since 100.0.2
26+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
27+
* will replace it as the default search engine.
2628
*/
2729
class Form extends Template
2830
{

app/code/Magento/CatalogSearch/Block/Advanced/Result.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*
1919
* @api
2020
* @since 100.0.2
21+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
22+
* will replace it as the default search engine.
2123
*/
2224
class Result extends Template
2325
{

app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php

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

1313
/**
1414
* Plugin for Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front
15+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
16+
* will replace it as the default search engine.
1517
*/
1618
class FrontTabPlugin
1719
{

app/code/Magento/CatalogSearch/Block/Result.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*
1919
* @api
2020
* @since 100.0.2
21+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
22+
* will replace it as the default search engine.
2123
*/
2224
class Result extends Template
2325
{

app/code/Magento/CatalogSearch/Block/SearchTermsLog.php

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

1111
/**
1212
* Class for logging search terms on cached pages
13+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
14+
* will replace it as the default search engine.
1315
*/
1416
class SearchTermsLog implements ArgumentInterface
1517
{

app/code/Magento/CatalogSearch/Controller/Advanced/Index.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
use Magento\Framework\Controller\ResultFactory;
1010

11+
/**
12+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
13+
* will replace it as the default search engine.
14+
*/
1115
class Index extends \Magento\Framework\App\Action\Action
1216
{
1317
/**

app/code/Magento/CatalogSearch/Controller/Advanced/Result.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
use Magento\Framework\App\Action\Context;
1111
use Magento\Framework\UrlFactory;
1212

13+
/**
14+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
15+
* will replace it as the default search engine.
16+
*/
1317
class Result extends \Magento\Framework\App\Action\Action
1418
{
1519
/**

app/code/Magento/CatalogSearch/Controller/Result/Index.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
use Magento\Search\Model\QueryFactory;
1414
use Magento\Search\Model\PopularSearchTerms;
1515

16+
/**
17+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
18+
* will replace it as the default search engine.
19+
*/
1620
class Index extends \Magento\Framework\App\Action\Action
1721
{
1822
/**

app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php

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

1616
/**
1717
* Controller for save search terms
18+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
19+
* will replace it as the default search engine.
1820
*/
1921
class Save extends \Magento\Framework\App\Action\Action
2022
{

app/code/Magento/CatalogSearch/Helper/Data.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.0.2
13+
* @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
14+
* will replace it as the default search engine.
1315
*/
1416
class Data extends \Magento\Search\Helper\Data
1517
{

0 commit comments

Comments
 (0)