Merge branch '2.3.0-release' into MAGETWO-95002

Author: irenelagno

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

@@ -4,11 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Advanced search form
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\CatalogSearch\Block\Advanced;
 
 use Magento\CatalogSearch\Model\Advanced;
@@ -21,10 +16,10 @@
 use Magento\Framework\View\Element\Template\Context;
 
 /**
+ * Advanced search form
+ *
  * @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
 {
@@ -60,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * @return AbstractBlock
+     * @inheritdoc
      */
     public function _prepareLayout()
     {
@@ -288,6 +283,8 @@ public function getAttributeYesNoElement($attribute)
     }
 
     /**
+     * Get select block.
+     *
      * @return BlockInterface
      */
     protected function _getSelectBlock()
@@ -301,6 +298,8 @@ protected function _getSelectBlock()
     }
 
     /**
+     * Get date block.
+     *
      * @return BlockInterface|mixed
      */
     protected function _getDateBlock()

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

@@ -18,8 +18,6 @@
  *
  * @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
 {
@@ -65,7 +63,7 @@ public function __construct(
     }
 
     /**
-     * @return AbstractBlock
+     * @inheritdoc
      */
     protected function _prepareLayout()
     {
@@ -127,6 +125,8 @@ public function setListModes()
     }
 
     /**
+     * Initialize list collection.
+     *
      * @return void
      */
     public function setListCollection()
@@ -135,6 +135,8 @@ public function setListCollection()
     }
 
     /**
+     * Get product collection.
+     *
      * @return Collection
      */
     protected function _getProductCollection()
@@ -143,6 +145,8 @@ protected function _getProductCollection()
     }
 
     /**
+     * Set search model.
+     *
      * @return Advanced
      */
     public function getSearchModel()
@@ -151,6 +155,8 @@ public function getSearchModel()
     }
 
     /**
+     * Get result count.
+     *
      * @return mixed
      */
     public function getResultCount()
@@ -163,6 +169,8 @@ public function getResultCount()
     }
 
     /**
+     * Get product list HTML.
+     *
      * @return string
      */
     public function getProductListHtml()
@@ -171,6 +179,8 @@ public function getProductListHtml()
     }
 
     /**
+     * Get form URL.
+     *
      * @return string
      */
     public function getFormUrl()
@@ -184,6 +194,8 @@ public function getFormUrl()
     }
 
     /**
+     * Get search criteria.
+     *
      * @return array
      */
     public function getSearchCriterias()

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

@@ -11,9 +11,7 @@
 use Magento\Framework\Data\Form\Element\Fieldset;
 
 /**
- * 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.
+ * Add Search Weight field to the product attribute add/edit tab
  */
 class FrontTabPlugin
 {

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

@@ -18,8 +18,6 @@
  *
  * @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

@@ -9,9 +9,7 @@
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
- * 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.
+ * Provider of the information on whether the page is cacheable, so that AJAX-based logging of terms can be triggered
  */
 class SearchTermsLog implements ArgumentInterface
 {

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

@@ -11,13 +11,12 @@
 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.
+ * Advanced search controller.
  */
 class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @inheritdoc
      */
     public function execute()
     {

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

@@ -13,8 +13,7 @@
 use Magento\Framework\UrlFactory;
 
 /**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
+ * Advanced search result.
  */
 class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
@@ -50,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @inheritdoc
      */
     public function execute()
     {

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

@@ -16,8 +16,7 @@
 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.
+ * Search result.
  */
 class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {

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

@@ -15,8 +15,6 @@
 
 /**
  * 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,8 +10,6 @@
  *
  * @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
 {