From b86683a580f5f84ba0d7b5514d6017713efdc594 Mon Sep 17 00:00:00 2001 From: Benjamin Perche Date: Thu, 17 Jul 2014 10:57:09 +0200 Subject: [PATCH] =?UTF-8?q?Refactor=20some=20classes=20namespaces=20=09mod?= =?UTF-8?q?ifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Controller?= =?UTF-8?q?/Admin/ImportExportController.php=20=09renomm=C3=A9:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20core/lib/Thelia/ImportExport/DocumentsExportI?= =?UTF-8?q?nterface.php=20->=20core/lib/Thelia/ImportExport/Export/Documen?= =?UTF-8?q?tsExportInterface.php=20=09renomm=C3=A9:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20core/lib/Thelia/ImportExport/ImagesExportInterface.php=20?= =?UTF-8?q?->=20core/lib/Thelia/ImportExport/Export/ImagesExportInterface.?= =?UTF-8?q?php=20=09renomm=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Theli?= =?UTF-8?q?a/ImportExport/Export/MailingExport.php=20->=20core/lib/Thelia/?= =?UTF-8?q?ImportExport/Export/Type/MailingExport.php=20=09renomm=C3=A9:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20core/lib/Thelia/ImportExport/Import/?= =?UTF-8?q?ProductStockImport.php=20->=20core/lib/Thelia/ImportExport/Impo?= =?UTF-8?q?rt/Type/ProductStockImport.php=20=09modifi=C3=A9:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20core/lib/Thelia/Model/Export.php=20=09modifi?= =?UTF-8?q?=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Tests/ImportE?= =?UTF-8?q?xport/Export/MailingExportTest.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/lib/Thelia/Controller/Admin/ImportExportController.php | 4 ++-- .../ImportExport/{ => Export}/DocumentsExportInterface.php | 2 +- .../ImportExport/{ => Export}/ImagesExportInterface.php | 2 +- .../Thelia/ImportExport/Export/{ => Type}/MailingExport.php | 3 ++- .../ImportExport/Import/{ => Type}/ProductStockImport.php | 3 ++- core/lib/Thelia/Model/Export.php | 4 ++-- .../Thelia/Tests/ImportExport/Export/MailingExportTest.php | 6 +++--- 7 files changed, 13 insertions(+), 11 deletions(-) rename core/lib/Thelia/ImportExport/{ => Export}/DocumentsExportInterface.php (97%) rename core/lib/Thelia/ImportExport/{ => Export}/ImagesExportInterface.php (97%) rename core/lib/Thelia/ImportExport/Export/{ => Type}/MailingExport.php (97%) rename core/lib/Thelia/ImportExport/Import/{ => Type}/ProductStockImport.php (97%) diff --git a/core/lib/Thelia/Controller/Admin/ImportExportController.php b/core/lib/Thelia/Controller/Admin/ImportExportController.php index fd11c6af2..f2c2f03c8 100644 --- a/core/lib/Thelia/Controller/Admin/ImportExportController.php +++ b/core/lib/Thelia/Controller/Admin/ImportExportController.php @@ -19,8 +19,8 @@ use Thelia\Core\Template\Loop\Export as ExportLoop; use Thelia\Core\Template\Loop\Import as ImportLoop; use Thelia\Form\Exception\FormValidationException; use Thelia\Form\ExportForm; -use Thelia\ImportExport\DocumentsExportInterface; -use Thelia\ImportExport\ImagesExportInterface; +use Thelia\ImportExport\Export\DocumentsExportInterface; +use Thelia\ImportExport\Export\ImagesExportInterface; use Thelia\Model\ExportQuery; use Thelia\Model\ImportQuery; diff --git a/core/lib/Thelia/ImportExport/DocumentsExportInterface.php b/core/lib/Thelia/ImportExport/Export/DocumentsExportInterface.php similarity index 97% rename from core/lib/Thelia/ImportExport/DocumentsExportInterface.php rename to core/lib/Thelia/ImportExport/Export/DocumentsExportInterface.php index ee5b68299..b9aca7b8d 100644 --- a/core/lib/Thelia/ImportExport/DocumentsExportInterface.php +++ b/core/lib/Thelia/ImportExport/Export/DocumentsExportInterface.php @@ -9,7 +9,7 @@ /* For the full copyright and license information, please view the LICENSE.txt */ /* file that was distributed with this source code. */ /*************************************************************************************/ -namespace Thelia\ImportExport; +namespace Thelia\ImportExport\Export; /** * Interface DocumentsExportInterface diff --git a/core/lib/Thelia/ImportExport/ImagesExportInterface.php b/core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php similarity index 97% rename from core/lib/Thelia/ImportExport/ImagesExportInterface.php rename to core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php index bb97e68cc..e075bcb2c 100644 --- a/core/lib/Thelia/ImportExport/ImagesExportInterface.php +++ b/core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php @@ -9,7 +9,7 @@ /* For the full copyright and license information, please view the LICENSE.txt */ /* file that was distributed with this source code. */ /*************************************************************************************/ -namespace Thelia\ImportExport; +namespace Thelia\ImportExport\Export; /** diff --git a/core/lib/Thelia/ImportExport/Export/MailingExport.php b/core/lib/Thelia/ImportExport/Export/Type/MailingExport.php similarity index 97% rename from core/lib/Thelia/ImportExport/Export/MailingExport.php rename to core/lib/Thelia/ImportExport/Export/Type/MailingExport.php index 31f49f865..aa2be5303 100644 --- a/core/lib/Thelia/ImportExport/Export/MailingExport.php +++ b/core/lib/Thelia/ImportExport/Export/Type/MailingExport.php @@ -10,10 +10,11 @@ /* file that was distributed with this source code. */ /*************************************************************************************/ -namespace Thelia\ImportExport\Export; +namespace Thelia\ImportExport\Export\Type; use Thelia\Core\FileFormat\Formatting\FormatterData; use Thelia\Core\FileFormat\FormatType; use Thelia\Core\Translation\Translator; +use Thelia\ImportExport\Export\ExportHandler; use Thelia\Model\CustomerQuery; use Thelia\Model\Map\CustomerTableMap; use Thelia\Model\Map\NewsletterTableMap; diff --git a/core/lib/Thelia/ImportExport/Import/ProductStockImport.php b/core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php similarity index 97% rename from core/lib/Thelia/ImportExport/Import/ProductStockImport.php rename to core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php index 98d234973..b495bac0b 100644 --- a/core/lib/Thelia/ImportExport/Import/ProductStockImport.php +++ b/core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php @@ -10,11 +10,12 @@ /* file that was distributed with this source code. */ /*************************************************************************************/ -namespace Thelia\ImportExport\Import; +namespace Thelia\ImportExport\Import\Type; use Propel\Runtime\Collection\ObjectCollection; use Thelia\Core\FileFormat\Formatting\FormatterData; use Thelia\Core\Translation\Translator; use Thelia\Core\FileFormat\FormatType; +use Thelia\ImportExport\Import\ImportHandler; use Thelia\Model\ProductSaleElementsQuery; /** diff --git a/core/lib/Thelia/Model/Export.php b/core/lib/Thelia/Model/Export.php index bcc25ffe8..0ef869cb3 100644 --- a/core/lib/Thelia/Model/Export.php +++ b/core/lib/Thelia/Model/Export.php @@ -5,9 +5,9 @@ namespace Thelia\Model; use Propel\Runtime\ActiveQuery\Criteria; use Symfony\Component\DependencyInjection\ContainerInterface; use Thelia\Core\Translation\Translator; -use Thelia\ImportExport\DocumentsExportInterface; +use Thelia\ImportExport\Export\DocumentsExportInterface; use Thelia\ImportExport\Export\ExportHandler; -use Thelia\ImportExport\ImagesExportInterface; +use Thelia\ImportExport\Export\ImagesExportInterface; use Thelia\Model\Base\Export as BaseExport; use Thelia\Model\Map\ExportTableMap; diff --git a/core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php b/core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php index fb5aa57be..fe99924f0 100644 --- a/core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php +++ b/core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php @@ -14,7 +14,7 @@ namespace Thelia\Tests\ImportExport\Export; use Symfony\Component\DependencyInjection\Container; use Thelia\Core\Translation\Translator; use Thelia\Core\FileFormat\FormatType; -use Thelia\ImportExport\Export\MailingExport; +use Thelia\ImportExport\Export\Type\MailingExport; /** * Class MailingExportTest @@ -23,7 +23,7 @@ use Thelia\ImportExport\Export\MailingExport; */ class MailingExportTest extends \PHPUnit_Framework_TestCase { - /** @var MailingExport $handler */ + /** @var \Thelia\ImportExport\Export\Type\MailingExport $handler */ protected $handler; public function setUp() @@ -32,7 +32,7 @@ class MailingExportTest extends \PHPUnit_Framework_TestCase new Translator($container); - $this->handler = new MailingExport($container); + $this->handler = new \Thelia\ImportExport\Export\Type\MailingExport($container); } public function testExport()