Merge pull request #1911 from magento-borg/MAGETWO-66191

Fixed issues:
- MAGETWO-66191 [SWAT] remove Solr from mainline/2.3 code base as it's sunsetted functionality per messaging at Imagine 2016 (1 year sunset period for Solr)

Author: slavvka

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

@@ -5,10 +5,9 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * @api
@@ -31,37 +30,26 @@ class IndexStructureFactory
      * @since 100.1.0
      */
     protected $structures = null;
-
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
     /**
-     * Configuration path by which current indexer handler stored
-     *
-     * @var string
+     * @var EngineResolverInterface
      */
-    private $configPath;
+    private $engineResolver;
 
     /**
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $structures
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
+        EngineResolverInterface $engineResolver,
         array $structures = []
     ) {
         $this->objectManager = $objectManager;
-        $this->scopeConfig = $scopeConfig;
-        $this->configPath = $configPath;
         $this->structures = $structures;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -73,7 +61,7 @@ public function __construct(
      */
     public function create(array $data = [])
     {
-        $currentStructure = $this->scopeConfig->getValue($this->configPath, ScopeInterface::SCOPE_STORE);
+        $currentStructure = $this->engineResolver->getCurrentSearchEngine();
         if (!isset($this->structures[$currentStructure])) {
             throw new \LogicException(
                 'There is no such index structure: ' . $currentStructure
@@ -83,7 +71,7 @@ public function create(array $data = [])
 
         if (!$indexStructure instanceof IndexStructureInterface) {
             throw new \InvalidArgumentException(
-                $indexStructure . ' doesn\'t implement \Magento\Framework\Indexer\IndexStructureInterface'
+                $currentStructure . ' index structure doesn\'t implement '. IndexStructureInterface::class
             );
         }
 

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

@@ -6,9 +6,8 @@
 
 namespace Magento\CatalogSearch\Model\Indexer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * Proxy for adapter-specific index switcher
@@ -30,49 +29,39 @@ class IndexSwitcherProxy implements IndexSwitcherInterface
     private $handlers;
 
     /**
-     * @var ScopeConfigInterface
+     * @var EngineResolverInterface
      */
-    private $scopeConfig;
-
-    /**
-     * Configuration path by which current indexer handler stored
-     *
-     * @var string
-     */
-    private $configPath;
+    private $engineResolver;
 
     /**
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $handlers
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
+        EngineResolverInterface $engineResolver,
         array $handlers = []
     ) {
         $this->objectManager = $objectManager;
-        $this->scopeConfig = $scopeConfig;
-        $this->configPath = $configPath;
         $this->handlers = $handlers;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
      * {@inheritDoc}
      *
      * As index switcher is an optional part of the search SPI, it may be not defined by a search engine.
-     * It is especially reasonable for search engines with pre-defined indexes declaration (like old SOLR and Sphinx)
+     * It is especially reasonable for search engines with pre-defined indexes declaration (like Sphinx)
      * which cannot create temporary indexes on the fly.
      * That's the reason why this method do nothing for the case
      * when switcher is not defined for a specific search engine.
      */
     public function switchIndex(array $dimensions)
     {
-        $currentHandler = $this->scopeConfig->getValue($this->configPath, ScopeInterface::SCOPE_STORE);
+        $currentHandler = $this->engineResolver->getCurrentSearchEngine();
         if (!isset($this->handlers[$currentHandler])) {
             return;
         }

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

@@ -5,10 +5,9 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * @api
@@ -31,35 +30,25 @@ class IndexerHandlerFactory
     protected $handlers = null;
 
     /**
-     * @var ScopeConfigInterface
+     * @var EngineResolverInterface
      */
-    private $scopeConfig;
-
-    /**
-     * Configuration path by which current indexer handler stored
-     *
-     * @var string
-     */
-    private $configPath;
+    private $engineResolver;
 
     /**
      * Factory constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ScopeConfigInterface $scopeConfig
-     * @param string $configPath
+     * @param EngineResolverInterface $engineResolver
      * @param string[] $handlers
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ScopeConfigInterface $scopeConfig,
-        $configPath,
+        EngineResolverInterface $engineResolver,
         array $handlers = []
     ) {
         $this->_objectManager = $objectManager;
-        $this->scopeConfig = $scopeConfig;
-        $this->configPath = $configPath;
         $this->handlers = $handlers;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -70,7 +59,7 @@ public function __construct(
      */
     public function create(array $data = [])
     {
-        $currentHandler = $this->scopeConfig->getValue($this->configPath, ScopeInterface::SCOPE_STORE);
+        $currentHandler = $this->engineResolver->getCurrentSearchEngine();
         if (!isset($this->handlers[$currentHandler])) {
             throw new \LogicException(
                 'There is no such indexer handler: ' . $currentHandler

app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php

@@ -19,11 +19,17 @@ interface EngineInterface
 
     /**
      * Scope identifier
+     *
+     * @deprecated since using engine resolver
+     * @see \Magento\Framework\Search\EngineResolverInterface
      */
     const SCOPE_IDENTIFIER = 'scope';
 
     /**
      * Configuration path by which current indexer handler stored
+     *
+     * @deprecated since using engine resolver
+     * @see \Magento\Framework\Search\EngineResolverInterface
      */
     const CONFIG_ENGINE_PATH = 'catalog/search/engine';
 

app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php

@@ -9,23 +9,29 @@
  */
 namespace Magento\CatalogSearch\Model\ResourceModel;
 
-use Magento\Store\Model\ScopeInterface;
+use Magento\CatalogSearch\Model\ResourceModel\EngineInterface;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * @api
  * @since 100.0.2
  */
 class EngineProvider
 {
+    /**
+     * @deprecated since using engine resolver
+     * @see \Magento\Framework\Search\EngineResolverInterface
+     */
     const CONFIG_ENGINE_PATH = 'catalog/search/engine';
 
     /**
-     * @var \Magento\CatalogSearch\Model\ResourceModel\EngineInterface
+     * @var EngineInterface
      */
     protected $engine;
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @deprecated since it is not used anymore
      */
     protected $scopeConfig;
 
@@ -42,18 +48,23 @@ class EngineProvider
     private $enginePool;
 
     /**
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $engines
+     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\ObjectManagerInterface $objectManager,
-        array $engines
+        array $engines,
+        EngineResolverInterface $engineResolver
     ) {
-        $this->scopeConfig = $scopeConfig;
         $this->objectManager = $objectManager;
         $this->enginePool = $engines;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -64,7 +75,7 @@ public function __construct(
     public function get()
     {
         if (!$this->engine) {
-            $currentEngine = $this->scopeConfig->getValue(self::CONFIG_ENGINE_PATH, ScopeInterface::SCOPE_STORE);
+            $currentEngine = $this->engineResolver->getCurrentSearchEngine();
             if (!isset($this->enginePool[$currentEngine])) {
                 throw new \LogicException(
                     'There is no such engine: ' . $currentEngine
@@ -73,12 +84,13 @@ public function get()
             $engineClassName = $this->enginePool[$currentEngine];
 
             $engine = $this->objectManager->create($engineClassName);
-            if (false === $engine instanceof \Magento\CatalogSearch\Model\ResourceModel\EngineInterface) {
+            if (false === $engine instanceof EngineInterface) {
                 throw new \LogicException(
-                    $engineClassName . ' doesn\'t implement \Magento\CatalogSearch\Model\ResourceModel\EngineInterface'
+                    $currentEngine . ' doesn\'t implement ' . EngineInterface::class
                 );
             }
 
+            /** @var $engine EngineInterface */
             if ($engine && !$engine->isAvailable()) {
                 throw new \LogicException(
                     'Engine is not available: ' . $currentEngine