MAGETWO-40747: Resolve dependecy to indexer module

Author: AndriyNasinnyk

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php

@@ -162,7 +162,7 @@ class Full
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\CatalogSearch\Model\Resource\Fulltext $fulltextResource
      * @param \Magento\Framework\Search\Request\DimensionFactory $dimensionFactory
-     * @param \Magento\Indexer\Model\ConfigInterface $indexerConfig
+     * @param \Magento\Framework\Indexer\ConfigInterface $indexerConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -182,7 +182,7 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\CatalogSearch\Model\Resource\Fulltext $fulltextResource,
         \Magento\Framework\Search\Request\DimensionFactory $dimensionFactory,
-        \Magento\Indexer\Model\ConfigInterface $indexerConfig
+        \Magento\Framework\Indexer\ConfigInterface $indexerConfig
     ) {
         $this->resource = $resource;
         $this->catalogProductType = $catalogProductType;

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php

@@ -8,7 +8,7 @@
 use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
 use Magento\Framework\Search\Request\DimensionFactory;
-use Magento\Indexer\Model\ConfigInterface;
+use Magento\Framework\Indexer\ConfigInterface;
 
 class Store
 {

app/code/Magento/Indexer/Model/Config.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Indexer\Model;
 
+use Magento\Framework\Indexer\ConfigInterface;
+
 class Config implements ConfigInterface
 {
     /**

app/code/Magento/Indexer/Model/Config/Data.php

@@ -13,13 +13,13 @@ class Data extends \Magento\Framework\Config\Data
     protected $stateCollection;
 
     /**
-     * @param \Magento\Indexer\Model\Config\Reader $reader
+     * @param \Magento\Framework\Indexer\Config\Reader $reader
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param \Magento\Indexer\Model\Resource\Indexer\State\Collection $stateCollection
      * @param string $cacheId
      */
     public function __construct(
-        \Magento\Indexer\Model\Config\Reader $reader,
+        \Magento\Framework\Indexer\Config\Reader $reader,
         \Magento\Framework\Config\CacheInterface $cache,
         \Magento\Indexer\Model\Resource\Indexer\State\Collection $stateCollection,
         $cacheId = 'indexer_config'

app/code/Magento/Indexer/Model/Config/SchemaLocator.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\Indexer\ActionFactory;
 use Magento\Framework\Indexer\ActionInterface;
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\IndexerInterface as IdxInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\StateInterface;

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

@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Data\Collection
     protected $_itemObjectClass = 'Magento\Framework\Indexer\IndexerInterface';
 
     /**
-     * @var \Magento\Indexer\Model\ConfigInterface
+     * @var \Magento\Framework\Indexer\ConfigInterface
      */
     protected $config;
 
@@ -26,12 +26,12 @@ class Collection extends \Magento\Framework\Data\Collection
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
-     * @param \Magento\Indexer\Model\ConfigInterface $config
+     * @param \Magento\Framework\Indexer\ConfigInterface $config
      * @param \Magento\Indexer\Model\Resource\Indexer\State\CollectionFactory $statesFactory
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
-        \Magento\Indexer\Model\ConfigInterface $config,
+        \Magento\Framework\Indexer\ConfigInterface $config,
         \Magento\Indexer\Model\Resource\Indexer\State\CollectionFactory $statesFactory
     ) {
         $this->config = $config;

app/code/Magento/Indexer/Model/Indexer/Collection.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Indexer\Model;
 
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\IndexerInterface;
 
 class Processor

app/code/Magento/Indexer/Model/Processor.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Indexer\Model\ConfigInterface;
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Indexer\Model\Resource\Indexer\State\CollectionFactory;
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Indexer\StateFactory;

app/code/Magento/Indexer/Setup/InstallData.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Indexer\Model\ConfigInterface;
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Indexer\StateFactory;
 use Magento\Indexer\Model\Resource\Indexer\State\CollectionFactory;

app/code/Magento/Indexer/Setup/Recurring.php

@@ -13,7 +13,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \Magento\Indexer\Model\Config\Reader|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Indexer\Config\Reader|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $reader;
 

app/code/Magento/Indexer/Test/Unit/Model/Config/DataTest.php

@@ -18,7 +18,7 @@ public function testLoadData()
             ['create']
         )->getMock();
 
-        $config = $this->getMockBuilder('Magento\Indexer\Model\ConfigInterface')->getMock();
+        $config = $this->getMockBuilder('Magento\Framework\Indexer\ConfigInterface')->getMock();
 
         $statesFactory = $this->getMockBuilder(
             'Magento\Indexer\Model\Resource\Indexer\State\CollectionFactory'

app/code/Magento/Indexer/Test/Unit/Model/Indexer/CollectionTest.php

@@ -15,7 +15,7 @@ class IndexerTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \Magento\Indexer\Model\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Indexer\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $configMock;
 
@@ -42,7 +42,7 @@ class IndexerTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->configMock = $this->getMockForAbstractClass(
-            'Magento\Indexer\Model\ConfigInterface',
+            'Magento\Framework\Indexer\ConfigInterface',
             [],
             '',
             false,

app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php

@@ -15,7 +15,7 @@ class ProcessorTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \Magento\Indexer\Model\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Indexer\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $configMock;
 
@@ -37,7 +37,7 @@ class ProcessorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->configMock = $this->getMockForAbstractClass(
-            'Magento\Indexer\Model\ConfigInterface',
+            'Magento\Framework\Indexer\ConfigInterface',
             [],
             '',
             false,

app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
     <preference for="Magento\Framework\Mview\View\State\CollectionInterface" type="Magento\Indexer\Model\Resource\Mview\View\State\Collection" />
     <preference for="Magento\Framework\Mview\View\StateInterface" type="Magento\Indexer\Model\Mview\View\State" />
-    <preference for="Magento\Indexer\Model\ConfigInterface" type="Magento\Indexer\Model\Config" />
+    <preference for="Magento\Framework\Indexer\ConfigInterface" type="Magento\Indexer\Model\Config" />
     <preference for="Magento\Framework\Indexer\IndexerInterface" type="Magento\Indexer\Model\Indexer" />
     <preference for="Magento\Indexer\Model\Indexer\Table\StrategyInterface" type="Magento\Indexer\Model\Indexer\Table\Strategy" />
     <type name="Magento\Indexer\Model\Indexer\Table\StrategyInterface" shared="false" />

app/code/Magento/Indexer/etc/di.xml

@@ -8,7 +8,7 @@
 class ConverterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Indexer\Model\Config\Converter
+     * @var \Magento\Framework\Indexer\Config\Converter
      */
     protected $model;
 

dev/tests/integration/testsuite/Magento/Indexer/Model/Config/ConverterTest.php

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Indexer\Model\Config;
+namespace Magento\Framework\Indexer\Config;
 
 use Magento\Framework\Config\ConverterInterface;
 

app/code/Magento/Indexer/Model/Config/Converter.php renamed to lib/internal/Magento/Framework/Indexer/Config/Converter.php

@@ -3,11 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Indexer\Model\Config;
+namespace Magento\Framework\Indexer\Config;
 
-/**
- * @codeCoverageIgnore
- */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
     /**
@@ -32,11 +29,13 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
+     *
+     * @codeCoverageIgnore
      */
     public function __construct(
         \Magento\Framework\Config\FileResolverInterface $fileResolver,
-        \Magento\Indexer\Model\Config\Converter $converter,
-        \Magento\Indexer\Model\Config\SchemaLocator $schemaLocator,
+        \Magento\Framework\Indexer\Config\Converter $converter,
+        \Magento\Framework\Indexer\Config\SchemaLocator $schemaLocator,
         \Magento\Framework\Config\ValidationStateInterface $validationState,
         $fileName = 'indexer.xml',
         $idAttributes = [],

app/code/Magento/Indexer/Model/Config/Reader.php renamed to lib/internal/Magento/Framework/Indexer/Config/Reader.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Indexer\Config;
+
+use Magento\Framework\Config\SchemaLocatorInterface;
+
+class SchemaLocator implements SchemaLocatorInterface
+{
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return realpath(__DIR__ . '/../etc/') . '/indexer_merged.xsd';
+    }
+
+    /**
+     * Get path to pre file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return realpath(__DIR__ . '/../etc/') . '/indexer.xsd';
+    }
+}

lib/internal/Magento/Framework/Indexer/Config/SchemaLocator.php

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Indexer\Model;
+namespace Magento\Framework\Indexer;
 
 interface ConfigInterface
 {

app/code/Magento/Indexer/Model/ConfigInterface.php renamed to lib/internal/Magento/Framework/Indexer/ConfigInterface.php

@@ -3,23 +3,23 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Indexer\Test\Unit\Model\Config;
+namespace Magento\Framework\Indexer\Test\Unit\Config;
 
 class ConverterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Indexer\Model\Config\Converter|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Indexer\Config\Converter|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_model;
 
     protected function setUp()
     {
-        $this->_model = new \Magento\Indexer\Model\Config\Converter();
+        $this->_model = new \Magento\Framework\Indexer\Config\Converter();
     }
 
     public function testConvert()
     {
-        $data = include __DIR__ . '/../../_files/indexer_config.php';
+        $data = include __DIR__ . '/../_files/indexer_config.php';
         $dom = new \DOMDocument();
         $dom->loadXML($data['inputXML']);