Move exceptions from model to module's root

bartoszherba · bartoszherba · commit bfbf1b48489d · 2017-11-03T19:17:41.000+01:00
diff --git a/Component/AdminRoles.php b/Component/AdminRoles.php
@@ -8,7 +8,7 @@
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class AdminRoles extends YamlComponentAbstract
 {
diff --git a/Component/AdminUsers.php b/Component/AdminUsers.php
@@ -6,7 +6,7 @@
 use Magento\Authorization\Model\RoleFactory;
 use Magento\Framework\ObjectManagerInterface;
 use CtiDigital\Configurator\Model\LoggerInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class AdminUsers extends YamlComponentAbstract
 {
diff --git a/Component/ApiIntegrations.php b/Component/ApiIntegrations.php
@@ -7,7 +7,7 @@
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Integration\Model\AuthorizationService;
 use Magento\Integration\Api\IntegrationServiceInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class ApiIntegrations extends YamlComponentAbstract
 {
diff --git a/Component/AttributeSets.php b/Component/AttributeSets.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Catalog\Model\Product;
diff --git a/Component/Attributes.php b/Component/Attributes.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Eav\Setup\EavSetup;
diff --git a/Component/Blocks.php b/Component/Blocks.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Cms\Api\Data\BlockInterfaceFactory;
 use Magento\Framework\ObjectManagerInterface;
diff --git a/Component/Categories.php b/Component/Categories.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use Magento\Framework\Webapi\Exception;
 use Symfony\Component\Yaml\Yaml;
 
diff --git a/Component/ComponentAbstract.php b/Component/ComponentAbstract.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/Component/Config.php b/Component/Config.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\StoreFactory;
diff --git a/Component/CsvComponentAbstract.php b/Component/CsvComponentAbstract.php
@@ -4,7 +4,7 @@
 
 use Magento\Framework\File\Csv;
 use Magento\Framework\Filesystem\Driver\File;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 /**
  * Class CsvComponentAbstract
diff --git a/Component/CustomerGroups.php b/Component/CustomerGroups.php
@@ -6,7 +6,7 @@
 use Magento\Tax\Model\ClassModelFactory;
 use Magento\Framework\ObjectManagerInterface;
 use CtiDigital\Configurator\Model\LoggerInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class CustomerGroups extends YamlComponentAbstract
 {
diff --git a/Component/Customers.php b/Component/Customers.php
@@ -2,7 +2,7 @@
 namespace CtiDigital\Configurator\Component;
 
 use CtiDigital\Configurator\Model\LoggerInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use Magento\Framework\ObjectManagerInterface;
 use FireGento\FastSimpleImport\Model\ImporterFactory;
 use Magento\ImportExport\Model\Import;
diff --git a/Component/Media.php b/Component/Media.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\ObjectManagerInterface;
diff --git a/Component/Pages.php b/Component/Pages.php
@@ -3,7 +3,7 @@
 namespace CtiDigital\Configurator\Component;
 
 use CtiDigital\Configurator\Helper\Component;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Cms\Api\Data\PageInterfaceFactory;
 use Magento\Cms\Api\PageRepositoryInterface;
diff --git a/Component/ProductLinks.php b/Component/ProductLinks.php
@@ -6,7 +6,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 use Magento\Framework\ObjectManagerInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class ProductLinks extends YamlComponentAbstract
 {
diff --git a/Component/Products.php b/Component/Products.php
@@ -7,7 +7,7 @@
 use CtiDigital\Configurator\Component\Product\Image;
 use CtiDigital\Configurator\Component\Product\AttributeOption;
 use FireGento\FastSimpleImport\Model\ImporterFactory;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 /**
  * Class Products
diff --git a/Component/Rewrites.php b/Component/Rewrites.php
@@ -6,7 +6,7 @@
 use Magento\UrlRewrite\Model\UrlRewriteFactory;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use CtiDigital\Configurator\Model\LoggerInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class Rewrites extends CsvComponentAbstract
 {
diff --git a/Component/TaxRates.php b/Component/TaxRates.php
@@ -5,7 +5,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\TaxImportExport\Model\Rate\CsvImportHandler;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class TaxRates extends CsvComponentAbstract
 {
diff --git a/Component/TaxRules.php b/Component/TaxRules.php
@@ -7,7 +7,7 @@
 use Magento\Tax\Model\Calculation\RuleFactory;
 use Magento\Tax\Model\Calculation\RateFactory;
 use Magento\Tax\Model\ClassModelFactory;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class TaxRules extends CsvComponentAbstract
 {
diff --git a/Component/Websites.php b/Component/Websites.php
@@ -4,7 +4,7 @@
 
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Framework\ObjectManagerInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use Magento\Store\Model\Group;
 use Magento\Store\Model\GroupFactory;
 use Magento\Store\Model\Store;
diff --git a/Component/Widgets.php b/Component/Widgets.php
@@ -4,7 +4,7 @@
 
 use CtiDigital\Configurator\Model\LoggerInterface;
 use Magento\Framework\ObjectManagerInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use Magento\Widget\Model\ResourceModel\Widget\Instance\Collection as WidgetCollection;
 use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeCollection;
 use Magento\Store\Model\StoreFactory;
diff --git a/Component/YamlComponentAbstract.php b/Component/YamlComponentAbstract.php
@@ -5,7 +5,7 @@
 use Magento\Framework\Webapi\Exception;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 /**
  * Class YamlComponentAbstract
diff --git a/Console/Command/ConfiguratorCommand.php b/Console/Command/ConfiguratorCommand.php
@@ -3,7 +3,7 @@
 namespace CtiDigital\Configurator\Console\Command;
 
 use CtiDigital\Configurator\Model\ConfiguratorAdapterInterface;
-use CtiDigital\Configurator\Model\Exception\ConfiguratorAdapterException;
+use CtiDigital\Configurator\Exception\ConfiguratorAdapterException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/Console/Command/ListCommand.php b/Console/Command/ListCommand.php
@@ -5,7 +5,7 @@
 use CtiDigital\Configurator\Model\ComponentList;
 use CtiDigital\Configurator\Model\Configurator\ConfigInterface;
 use CtiDigital\Configurator\Model\ConfiguratorAdapterInterface;
-use CtiDigital\Configurator\Model\Exception\ConfiguratorAdapterException;
+use CtiDigital\Configurator\Exception\ConfiguratorAdapterException;
 use Magento\Framework\ObjectManagerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/Console/Command/RunCommand.php b/Console/Command/RunCommand.php
@@ -4,7 +4,7 @@
 
 use CtiDigital\Configurator\Model\Configurator\ConfigInterface;
 use CtiDigital\Configurator\Model\ConfiguratorAdapterInterface;
-use CtiDigital\Configurator\Model\Exception\ConfiguratorAdapterException;
+use CtiDigital\Configurator\Exception\ConfiguratorAdapterException;
 use CtiDigital\Configurator\Model\Processor;
 use Magento\Framework\ObjectManagerInterface;
 use Symfony\Component\Console\Command\Command;
diff --git a/Exception/ComponentException.php b/Exception/ComponentException.php
@@ -1,5 +1,5 @@
 <?php
-namespace CtiDigital\Configurator\Model\Exception;
+namespace CtiDigital\Configurator\Exception;
 
 class ComponentException extends \RuntimeException
 {
diff --git a/Exception/ConfiguratorAdapterException.php b/Exception/ConfiguratorAdapterException.php
@@ -1,5 +1,5 @@
 <?php
-namespace CtiDigital\Configurator\Model\Exception;
+namespace CtiDigital\Configurator\Exception;
 
 class ConfiguratorAdapterException extends \RuntimeException
 {
diff --git a/Helper/Component.php b/Helper/Component.php
@@ -2,7 +2,7 @@
 
 namespace CtiDigital\Configurator\Helper;
 
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Store\Model\StoreManagerInterface;
diff --git a/Model/Processor.php b/Model/Processor.php
@@ -4,7 +4,7 @@
 
 use CtiDigital\Configurator\Component\ComponentAbstract;
 use CtiDigital\Configurator\Model\Configurator\ConfigInterface;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 use Magento\Framework\ObjectManagerInterface;
 use Symfony\Component\Yaml\Parser;
 use Magento\Framework\App\State;
diff --git a/Test/Unit/Component/CustomersTest.php b/Test/Unit/Component/CustomersTest.php
@@ -2,7 +2,7 @@
 namespace CtiDigital\Configurator\Test\Unit\Component;
 
 use CtiDigital\Configurator\Component\Customers;
-use CtiDigital\Configurator\Model\Exception\ComponentException;
+use CtiDigital\Configurator\Exception\ComponentException;
 
 class CustomersTest extends ComponentAbstractTestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use CtiDigital\Configurator\Model\LoggerInterface;`
`9`	`9`	`use Magento\Authorization\Model\UserContextInterface;`
`10`	`10`	`use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;`
`11`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`11`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`12`	`12`
`13`	`13`	`class AdminRoles extends YamlComponentAbstract`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Magento\Authorization\Model\RoleFactory;`
`7`	`7`	`use Magento\Framework\ObjectManagerInterface;`
`8`	`8`	`use CtiDigital\Configurator\Model\LoggerInterface;`
`9`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`9`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`10`	`10`
`11`	`11`	`class AdminUsers extends YamlComponentAbstract`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use CtiDigital\Configurator\Model\LoggerInterface;`
`8`	`8`	`use Magento\Integration\Model\AuthorizationService;`
`9`	`9`	`use Magento\Integration\Api\IntegrationServiceInterface;`
`10`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`10`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`11`	`11`
`12`	`12`	`class ApiIntegrations extends YamlComponentAbstract`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Magento\Tax\Model\ClassModelFactory;`
`7`	`7`	`use Magento\Framework\ObjectManagerInterface;`
`8`	`8`	`use CtiDigital\Configurator\Model\LoggerInterface;`
`9`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`9`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`10`	`10`
`11`	`11`	`class CustomerGroups extends YamlComponentAbstract`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Magento\Catalog\Api\ProductRepositoryInterface;`
`7`	`7`	`use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;`
`8`	`8`	`use Magento\Framework\ObjectManagerInterface;`
`9`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`9`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`10`	`10`
`11`	`11`	`class ProductLinks extends YamlComponentAbstract`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Magento\UrlRewrite\Model\UrlRewriteFactory;`
`7`	`7`	`use Magento\UrlRewrite\Model\UrlPersistInterface;`
`8`	`8`	`use CtiDigital\Configurator\Model\LoggerInterface;`
`9`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`9`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`10`	`10`
`11`	`11`	`class Rewrites extends CsvComponentAbstract`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Magento\Framework\ObjectManagerInterface;`
`6`	`6`	`use CtiDigital\Configurator\Model\LoggerInterface;`
`7`	`7`	`use Magento\TaxImportExport\Model\Rate\CsvImportHandler;`
`8`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`8`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`9`	`9`
`10`	`10`	`class TaxRates extends CsvComponentAbstract`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Magento\Tax\Model\Calculation\RuleFactory;`
`8`	`8`	`use Magento\Tax\Model\Calculation\RateFactory;`
`9`	`9`	`use Magento\Tax\Model\ClassModelFactory;`
`10`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`10`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`11`	`11`
`12`	`12`	`class TaxRules extends CsvComponentAbstract`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<?php`
`2`		`-namespace CtiDigital\Configurator\Model\Exception;`
	`2`	`+namespace CtiDigital\Configurator\Exception;`
`3`	`3`
`4`	`4`	`class ComponentException extends \RuntimeException`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`namespace CtiDigital\Configurator\Test\Unit\Component;`
`3`	`3`
`4`	`4`	`use CtiDigital\Configurator\Component\Customers;`
`5`		`-use CtiDigital\Configurator\Model\Exception\ComponentException;`
	`5`	`+use CtiDigital\Configurator\Exception\ComponentException;`
`6`	`6`
`7`	`7`	`class CustomersTest extends ComponentAbstractTestCase`
`8`	`8`	`{`