Merge remote-tracking branch 'origin/MAGETWO-36986' into S67

Author: Andrii Kasian

app/code/Magento/CatalogSearch/Model/Resource/Engine.php

@@ -37,35 +37,25 @@ class Engine extends AbstractDb implements EngineInterface
      */
     protected $_catalogSearchData = null;
 
-    /**
-     * Catalog search data
-     *
-     * @var \Magento\Search\Model\Resource\Helper
-     */
-    protected $_resourceHelper;
-
     /**
      * Construct
      *
      * @param \Magento\Framework\Model\Resource\Db\Context $context
      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
      * @param Advanced $searchResource
      * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData
-     * @param \Magento\Search\Model\Resource\Helper $resourceHelper
      * @param string|null $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
         \Magento\CatalogSearch\Model\Resource\Advanced $searchResource,
         \Magento\CatalogSearch\Helper\Data $catalogSearchData,
-        \Magento\Search\Model\Resource\Helper $resourceHelper,
         $resourcePrefix = null
     ) {
         $this->_catalogProductVisibility = $catalogProductVisibility;
         $this->_searchResource = $searchResource;
         $this->_catalogSearchData = $catalogSearchData;
-        $this->_resourceHelper = $resourceHelper;
         parent::__construct($context, $resourcePrefix);
     }
 
@@ -118,7 +108,7 @@ public function saveEntityIndexes($storeId, $entityIndexes, $entity = 'product')
         }
 
         if ($data) {
-            $this->_resourceHelper->insertOnDuplicate($this->getMainTable(), $data, ['data_index']);
+            $this->_getWriteAdapter()->insertOnDuplicate($this->getMainTable(), $data, ['data_index']);
         }
 
         return $this;

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

@@ -5,51 +5,29 @@
  */
 namespace Magento\CatalogSearch\Model\Resource;
 
-use Magento\Search\Model\Resource\Helper;
-
 /**
  * CatalogSearch Fulltext Index resource model
  */
 class Fulltext extends \Magento\Framework\Model\Resource\Db\AbstractDb
 {
-    /**
-     * Core string
-     *
-     * @var \Magento\Framework\Filter\FilterManager
-     */
-    protected $filter;
-
     /**
      * Core event manager proxy
      *
      * @var \Magento\Framework\Event\ManagerInterface
      */
     protected $_eventManager;
 
-    /**
-     * CatalogSearch resource helper
-     *
-     * @var \Magento\Search\Model\Resource\Helper
-     */
-    protected $_resourceHelper;
-
     /**
      * @param \Magento\Framework\Model\Resource\Db\Context $context
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Filter\FilterManager $filter
-     * @param Helper $resourceHelper
      * @param string|null $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Filter\FilterManager $filter,
-        \Magento\Search\Model\Resource\Helper $resourceHelper,
         $resourcePrefix = null
     ) {
         $this->_eventManager = $eventManager;
-        $this->filter = $filter;
-        $this->_resourceHelper = $resourceHelper;
         parent::__construct($context, $resourcePrefix);
     }
 

app/code/Magento/Search/Model/Resource/Helper.php

@@ -30,7 +30,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Search resource helper
      *
-     * @var \Magento\Search\Model\Resource\Helper
+     * @var \Magento\Framework\DB\Helper
      */
     protected $_resourceHelper;
 
@@ -40,7 +40,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Search\Model\Resource\Helper $resourceHelper
+     * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Zend_Db_Adapter_Abstract $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -50,7 +50,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Search\Model\Resource\Helper $resourceHelper,
+        \Magento\Framework\DB\Helper $resourceHelper,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {

app/code/Magento/Search/Model/Resource/Query/Collection.php

@@ -3334,4 +3334,5 @@
     ['Magento\Log\Model\LogFactory\Clean'],
     ['Magento\Log\Model\Shell\CommandInterface'],
     ['Magento\Framework\App\Filesystem\DirectoryList\AbstractShell'],
+    ['Magento\Search\Model\Resource\Helper'],
 ];