Merge branch 'MAGETWO-84397' into 2.2.4-PR-20170111

Dmytro Voskoboinikov · Dmytro Voskoboinikov · commit 94e42f0e0136 · 2018-02-09T16:07:46.000+02:00
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -12,7 +12,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface as TableSwapper;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 
 /**
  * @api
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface;
 use Magento\Framework\App\ResourceConnection;
 
 /**
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\CatalogRule\Api;
+namespace Magento\CatalogRule\Model\Indexer;
 
 /**
  * Manage additional tables used while building new index to preserve
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface as TableSwapper;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface as TableSwapper;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 use Magento\Framework\App\ObjectManager;
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface as TableSwapper;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 use Magento\Framework\App\ObjectManager;
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface as TableSwapper;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 use Magento\Framework\App\ObjectManager;
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
 
 class ReindexRuleGroupWebsiteTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
 
 class ReindexRuleProductTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
 
 class RuleProductPricesPersistorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
@@ -8,7 +8,7 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\CatalogRule\Api\IndexerTableSwapperInterface;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace Magento\CatalogRule\Test\Unit\Model\Indexer;`
`8`	`8`
`9`	`9`	`use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;`
`10`		`-use Magento\CatalogRule\Api\IndexerTableSwapperInterface;`
	`10`	`+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;`
`11`	`11`
`12`	`12`	`class ReindexRuleGroupWebsiteTest extends \PHPUnit\Framework\TestCase`
`13`	`13`	`{`