MAGETWO-95259: CatalogSearch module deprecation must be reverted

Author: paliarush

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,6 +16,8 @@
 use Magento\Framework\View\Element\Template\Context;
 
 /**
+ * Advanced search form
+ *
  * @api
  * @since 100.0.2
  */
@@ -58,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * @return AbstractBlock
+     * @inheritdoc
      */
     public function _prepareLayout()
     {
@@ -286,6 +283,8 @@ public function getAttributeYesNoElement($attribute)
     }
 
     /**
+     * Get select block.
+     *
      * @return BlockInterface
      */
     protected function _getSelectBlock()
@@ -299,6 +298,8 @@ protected function _getSelectBlock()
     }
 
     /**
+     * Get date block.
+     *
      * @return BlockInterface|mixed
      */
     protected function _getDateBlock()

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

@@ -63,7 +63,7 @@ public function __construct(
     }
 
     /**
-     * @return AbstractBlock
+     * @inheritdoc
      */
     protected function _prepareLayout()
     {
@@ -125,6 +125,8 @@ public function setListModes()
     }
 
     /**
+     * Initialize list collection.
+     *
      * @return void
      */
     public function setListCollection()
@@ -133,6 +135,8 @@ public function setListCollection()
     }
 
     /**
+     * Get product collection.
+     *
      * @return Collection
      */
     protected function _getProductCollection()
@@ -141,6 +145,8 @@ protected function _getProductCollection()
     }
 
     /**
+     * Set search model.
+     *
      * @return Advanced
      */
     public function getSearchModel()
@@ -149,6 +155,8 @@ public function getSearchModel()
     }
 
     /**
+     * Get result count.
+     *
      * @return mixed
      */
     public function getResultCount()
@@ -161,6 +169,8 @@ public function getResultCount()
     }
 
     /**
+     * Get product list HTML.
+     *
      * @return string
      */
     public function getProductListHtml()
@@ -169,6 +179,8 @@ public function getProductListHtml()
     }
 
     /**
+     * Get form URL.
+     *
      * @return string
      */
     public function getFormUrl()
@@ -182,6 +194,8 @@ public function getFormUrl()
     }
 
     /**
+     * Get search criteria.
+     *
      * @return array
      */
     public function getSearchCriterias()

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

@@ -10,10 +10,13 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * 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

@@ -12,6 +12,9 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\UrlFactory;
 
+/**
+ * Advanced search result.
+ */
 class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
@@ -46,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @inheritdoc
      */
     public function execute()
     {

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

@@ -15,6 +15,9 @@
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\PopularSearchTerms;
 
+/**
+ * Search result.
+ */
 class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**

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

@@ -29,7 +29,7 @@ public function __construct($name)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isApplicable(RequestInterface $request)
     {

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

@@ -10,6 +10,8 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
+ * Catalog search config.
+ *
  * @api
  * @since 100.0.2
  */
@@ -33,7 +35,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get()
     {

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

@@ -6,6 +6,8 @@
 namespace Magento\CatalogSearch\Model\Adminhtml\System\Config\Backend;
 
 /**
+ * Backend model for catalog search engine system config
+ *
  * @api
  * @since 100.0.2
  */
@@ -42,6 +44,7 @@ public function __construct(
 
     /**
      * After save call
+     *
      * Invalidate catalog search index if engine was changed
      *
      * @return $this

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

@@ -22,6 +22,7 @@
 
 /**
  * Catalog advanced search model
+ *
  * @method int getEntityTypeId()
  * @method \Magento\CatalogSearch\Model\Advanced setEntityTypeId(int $value)
  * @method int getAttributeSetId()
@@ -296,6 +297,8 @@ public function prepareProductCollection($collection)
     }
 
     /**
+     * Add search criteria.
+     *
      * @param EntityAttribute $attribute
      * @param mixed $value
      * @return void

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

@@ -7,8 +7,9 @@
 namespace Magento\CatalogSearch\Model\Attribute;
 
 /**
- * This plugin is responsible for processing of search_weight property of a product attribute,
- * which is used to boost matches by specific attributes.
+ * This plugin is responsible for processing of search_weight property of a product attribute.
+ *
+ * 'search_weight' is used to boost matches by specific attributes.
  *
  * This is part of search accuracy customization functionality.
  */