Merge pull request magento#82 from magento-trigger/MAGETWO-88054

rganin · web-flow · commit 69b4161d6b5c · 2018-03-01T16:42:08.000+02:00
MAGETWO-88054: Move declarative setup from setup to framework
diff --git a/app/code/Magento/BundleSampleData/Setup/Patch/Data/InstallBundleSampleData.php b/app/code/Magento/BundleSampleData/Setup/Patch/Data/InstallBundleSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\BundleSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallBundleSampleData
diff --git a/app/code/Magento/CatalogRuleSampleData/Setup/Patch/Data/InstallCatalogRuleSampleData.php b/app/code/Magento/CatalogRuleSampleData/Setup/Patch/Data/InstallCatalogRuleSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\CatalogRuleSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallCatalogRuleSampleData
diff --git a/app/code/Magento/CatalogSampleData/Setup/Patch/Data/InstallCatalogSampleData.php b/app/code/Magento/CatalogSampleData/Setup/Patch/Data/InstallCatalogSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\CatalogSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallCatalogSampleData
diff --git a/app/code/Magento/CmsSampleData/Setup/Patch/Data/InstallCmsSampleData.php b/app/code/Magento/CmsSampleData/Setup/Patch/Data/InstallCmsSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\CmsSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallCmsSampleData
diff --git a/app/code/Magento/ConfigurableSampleData/Setup/Patch/Data/InstallConfigurableSampleData.php b/app/code/Magento/ConfigurableSampleData/Setup/Patch/Data/InstallConfigurableSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\ConfigurableSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallConfigurableSampleData
diff --git a/app/code/Magento/CustomerSampleData/Setup/Patch/Data/InstallCustomerSampleData.php b/app/code/Magento/CustomerSampleData/Setup/Patch/Data/InstallCustomerSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\CustomerSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallCustomerSampleData
diff --git a/app/code/Magento/DownloadableSampleData/Setup/Patch/Data/InstallDownloadableSampleData.php b/app/code/Magento/DownloadableSampleData/Setup/Patch/Data/InstallDownloadableSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\DownloadableSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallDownloadableSampleData
diff --git a/app/code/Magento/GroupedProductSampleData/Setup/Patch/Data/InstallGroupedProductSampleData.php b/app/code/Magento/GroupedProductSampleData/Setup/Patch/Data/InstallGroupedProductSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\GroupedProductSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallGroupedProductSampleData
diff --git a/app/code/Magento/MsrpSampleData/Setup/Patch/Data/InstallMsrpSampleData.php b/app/code/Magento/MsrpSampleData/Setup/Patch/Data/InstallMsrpSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\MsrpSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallMsrpSampleData
diff --git a/app/code/Magento/OfflineShippingSampleData/Setup/Patch/Data/InstallOfflineShippingSampleData.php b/app/code/Magento/OfflineShippingSampleData/Setup/Patch/Data/InstallOfflineShippingSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\OfflineShippingSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallOfflineShippingSampleData
diff --git a/app/code/Magento/ProductLinksSampleData/Setup/Patch/Data/InstallProductLinksSampleData.php b/app/code/Magento/ProductLinksSampleData/Setup/Patch/Data/InstallProductLinksSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\ProductLinksSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallProductLinksSampleData
diff --git a/app/code/Magento/ReviewSampleData/Setup/Patch/Data/InstallReviewSampleData.php b/app/code/Magento/ReviewSampleData/Setup/Patch/Data/InstallReviewSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\ReviewSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallReviewSampleData
diff --git a/app/code/Magento/SalesRuleSampleData/Setup/Patch/Data/InstallSalesRuleSampleData.php b/app/code/Magento/SalesRuleSampleData/Setup/Patch/Data/InstallSalesRuleSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\SalesRuleSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallSalesRuleSampleData
diff --git a/app/code/Magento/SalesSampleData/Setup/Patch/Data/InstallSalesSampleData.php b/app/code/Magento/SalesSampleData/Setup/Patch/Data/InstallSalesSampleData.php
@@ -8,9 +8,9 @@
 
 use Magento\Framework\Indexer\AbstractProcessor;
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\NonTransactionableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\NonTransactionableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallSalesSampleData
diff --git a/app/code/Magento/SwatchesSampleData/Setup/Patch/Data/InstallSwatchesSampleData.php b/app/code/Magento/SwatchesSampleData/Setup/Patch/Data/InstallSwatchesSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\SwatchesSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallSwatchesSampleData
diff --git a/app/code/Magento/TaxSampleData/Setup/Patch/Data/InstallTaxSampleData.php b/app/code/Magento/TaxSampleData/Setup/Patch/Data/InstallTaxSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\TaxSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallTaxSampleData
diff --git a/app/code/Magento/ThemeSampleData/Setup/Patch/Data/InstallThemeSampleData.php b/app/code/Magento/ThemeSampleData/Setup/Patch/Data/InstallThemeSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\ThemeSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallThemeSampleData
diff --git a/app/code/Magento/WidgetSampleData/Setup/Patch/Data/InstallWidgetSampleData.php b/app/code/Magento/WidgetSampleData/Setup/Patch/Data/InstallWidgetSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\WidgetSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallWidgetSampleData
diff --git a/app/code/Magento/WishlistSampleData/Setup/Patch/Data/InstallWishlistSampleData.php b/app/code/Magento/WishlistSampleData/Setup/Patch/Data/InstallWishlistSampleData.php
@@ -7,8 +7,8 @@
 namespace Magento\WishlistSampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallWishlistSampleData
