Merge remote-tracking branch 'origin/BugFixPR' into MAGETWO-93723

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
 {