Merge pull request #3138 from magento-borg/BugFixPR

[2.3.0-Regression] Bug Fixes

Author: Joan He

app/code/Magento/Braintree/composer.json

@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.1.3||~7.2.0",
-        "braintree/braintree_php": "3.34.0",
+        "braintree/braintree_php": "3.35.0",
         "magento/framework": "*",
         "magento/magento-composer-installer": "*",
         "magento/module-catalog": "*",

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -47,6 +47,7 @@
         <element name="setProductAsNewFrom" type="input" selector="input[name='product[news_from_date]']"/>
         <element name="setProductAsNewTo" type="input" selector="input[name='product[news_to_date]']"/>
         <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
+        <element name="customSelectField" type="select" selector="//select[@name='product[{{var}}]']" parameterized="true"/>
     </section>
     <section name="ProductInWebsitesSection">
         <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml

@@ -13,4 +13,7 @@
         <element name="filterOption" type="text" selector=".filter-options-content .item"/>
         <element name="optionQty" type="text" selector=".filter-options-content .item .count"/>
     </section>
+    <section name="StorefrontCategorySidebarMobileSection">
+        <element name="shopByButton" type="button" selector="//div[contains(@class, 'filter-title')]/strong[contains(text(), 'Shop By')]"/>
+    </section>
 </sections>

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php

@@ -97,7 +97,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             }
 
             if (!$this->collection->isLoaded()) {
-                $that->attributesJoiner->join($info->fieldASTs[0], $this->collection);
+                $that->attributesJoiner->join($info->fieldNodes[0], $this->collection);
                 $this->collection->addIdFilter($this->categoryIds);
             }
             /** @var CategoryInterface | \Magento\Catalog\Model\Category $item */

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php

@@ -89,7 +89,7 @@ public function __construct(
      */
     public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
     {
-        $categoryQuery = $resolveInfo->fieldASTs[0];
+        $categoryQuery = $resolveInfo->fieldNodes[0];
         $collection = $this->collectionFactory->create();
         $this->joinAttributesRecursively($collection, $categoryQuery);
         $depth = $this->depthCalculator->calculate($categoryQuery);

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

@@ -23,6 +23,8 @@
 /**
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Form extends Template
 {

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

@@ -18,6 +18,8 @@
  *
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Result extends Template
 {

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

@@ -12,6 +12,8 @@
 
 /**
  * Plugin for Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class FrontTabPlugin
 {

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

@@ -18,6 +18,8 @@
  *
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Result extends Template
 {

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

@@ -10,6 +10,8 @@
 
 /**
  * Class for logging search terms on cached pages
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class SearchTermsLog implements ArgumentInterface
 {

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

@@ -8,6 +8,10 @@
 
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**

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

@@ -10,6 +10,10 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\UrlFactory;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class Result extends \Magento\Framework\App\Action\Action
 {
     /**

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

@@ -13,6 +13,10 @@
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\PopularSearchTerms;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**

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

@@ -15,6 +15,8 @@
 
 /**
  * Controller for save search terms
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Save extends \Magento\Framework\App\Action\Action
 {

app/code/Magento/CatalogSearch/Helper/Data.php

@@ -10,6 +10,8 @@
  *
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Data extends \Magento\Search\Helper\Data
 {

app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php

@@ -14,6 +14,10 @@
 use Magento\Framework\Search\RequestInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class AggregationResolver implements AggregationResolverInterface
 {
     /**

app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php

@@ -12,6 +12,8 @@
  * Request checker for advanced search.
  *
  * Checks advanced search query whether required to collect all attributes for entity.
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class AdvancedSearch implements RequestCheckerInterface
 {

app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php

@@ -17,6 +17,8 @@
  * Request checker for catalog view.
  *
  * Checks catalog view query whether required to collect all attributes for entity.
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class CatalogView implements RequestCheckerInterface
 {

app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php

@@ -9,6 +9,10 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class RequestCheckerComposite implements RequestCheckerInterface
 {
     /**

app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerInterface.php

@@ -9,6 +9,9 @@
 
 /**
  * RequestCheckerInterface provides the interface to work with query checkers.
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 interface RequestCheckerInterface
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php

@@ -17,6 +17,10 @@
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class DataProvider implements DataProviderInterface
 {
     /**

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php

@@ -22,6 +22,9 @@
 /**
  * Attribute query builder
  *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class QueryBuilder

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php

@@ -21,6 +21,9 @@
 
 /**
  * Build select for attribute.
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class SelectBuilderForAttribute
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php

@@ -13,6 +13,9 @@
 
 /**
  * Join stock table with stock condition to select.
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class ApplyStockConditionToSelect
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php

@@ -18,6 +18,9 @@
  *
  * The main idea of this strategy is using eav index table as main table for query
  * in case when search request requires search by attributes
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class BaseSelectAttributesSearchStrategy implements BaseSelectStrategyInterface
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php

@@ -17,6 +17,9 @@
  *
  * The main idea of this strategy is using fulltext search index table as main table for query
  * in case when search request does not requires any search by attributes
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class BaseSelectFullTextSearchStrategy implements BaseSelectStrategyInterface
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php

@@ -24,6 +24,8 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class DataProvider implements DataProviderInterface
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php

@@ -10,6 +10,10 @@
 use Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface;
 use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class Resolver implements ResolverInterface
 {
     /**

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php

@@ -12,6 +12,8 @@
  * Purpose of class is to resolve table alias for Search Request filter
  * @api
  * @since 100.1.6
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class AliasResolver
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php

@@ -25,6 +25,8 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Preprocessor implements PreprocessorInterface
 {

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php

@@ -18,6 +18,8 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class DataProvider
 {

app/code/Magento/CatalogSearch/Model/Adapter/Options.php

@@ -12,6 +12,8 @@
 /**
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Options implements OptionsInterface
 {

app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php

@@ -6,9 +6,10 @@
 namespace Magento\CatalogSearch\Model\Adminhtml\System\Config\Backend;
 
 /**
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Engine extends \Magento\Framework\App\Config\Value
 {

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

@@ -43,6 +43,8 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Advanced extends \Magento\Framework\Model\AbstractModel
 {

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

@@ -10,6 +10,8 @@
 /**
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Builder extends RequestBuilder
 {

app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php

@@ -11,6 +11,9 @@
  * which is used to boost matches by specific attributes.
  *
  * This is part of search accuracy customization functionality.
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class SearchWeight
 {

app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php

@@ -13,6 +13,10 @@
 use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
+ */
 class DataProvider implements DataProviderInterface
 {
     /**

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

@@ -21,6 +21,9 @@
  * @method \Magento\CatalogSearch\Model\Fulltext setStoreId(int $value)
  * @method string getDataIndex()
  * @method \Magento\CatalogSearch\Model\Fulltext setDataIndex(string $value)
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Fulltext extends \Magento\Framework\Model\AbstractModel
 {

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

@@ -19,6 +19,8 @@
  *
  * @api
  * @since 100.0.2
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Fulltext implements
     \Magento\Framework\Indexer\ActionInterface,

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php

@@ -16,6 +16,8 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @api
  * @since 100.0.3
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class DataProvider
 {

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php

@@ -22,6 +22,9 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ *
+ * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
+ *             will replace it as the default search engine.
  */
 class Full
 {