From 0723f30695f86cec70971c513495d1c312bc5690 Mon Sep 17 00:00:00 2001 From: Benjamin Perche Date: Fri, 18 Jul 2014 14:35:07 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20cs=20=09supprim=C3=A9:=20=20=20=20=20=20?= =?UTF-8?q?=20=20core/lib/Thelia/Controller/Admin/CustomerExportController?= =?UTF-8?q?.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thel?= =?UTF-8?q?ia/Controller/Admin/ExportController.php=20=09modifi=C3=A9:=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20core/lib/Thelia/Controller/Admin/Import?= =?UTF-8?q?Controller.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20cor?= =?UTF-8?q?e/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php?= =?UTF-8?q?=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/C?= =?UTF-8?q?ore/Event/ImportExport.php=20=09modifi=C3=A9:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder?= =?UTF-8?q?Manager.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/l?= =?UTF-8?q?ib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.ph?= =?UTF-8?q?p=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/?= =?UTF-8?q?Core/FileFormat/Formatting/Exception/BadFormattedStringExceptio?= =?UTF-8?q?n.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/The?= =?UTF-8?q?lia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php=20=09?= =?UTF-8?q?modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Core/Fi?= =?UTF-8?q?leFormat/Formatting/FormatterManager.php=20=09modifi=C3=A9:=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20core/lib/Thelia/Core/FileFormat/Formatt?= =?UTF-8?q?ing/FormatterManagerTrait.php=20=09modifi=C3=A9:=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20core/lib/Thelia/Core/Template/Loop/ImportExportType?= =?UTF-8?q?.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thel?= =?UTF-8?q?ia/Model/Export.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20core/lib/Thelia/Model/Import.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/CustomerExportController.php | 36 ------------------- .../Controller/Admin/ExportController.php | 14 ++++---- .../Controller/Admin/ImportController.php | 13 +++---- .../Loader/XmlFileLoader.php | 1 - core/lib/Thelia/Core/Event/ImportExport.php | 3 +- .../Archive/ArchiveBuilderManager.php | 3 +- .../Archive/ArchiveBuilderManagerTrait.php | 2 +- .../Exception/BadFormattedStringException.php | 2 +- .../Formatting/Formatter/XMLFormatter.php | 7 ++-- .../Formatting/FormatterManager.php | 6 ++-- .../Formatting/FormatterManagerTrait.php | 4 +-- .../Core/Template/Loop/ImportExportType.php | 5 ++- core/lib/Thelia/Model/Export.php | 1 - core/lib/Thelia/Model/Import.php | 5 +-- 14 files changed, 30 insertions(+), 72 deletions(-) delete mode 100644 core/lib/Thelia/Controller/Admin/CustomerExportController.php diff --git a/core/lib/Thelia/Controller/Admin/CustomerExportController.php b/core/lib/Thelia/Controller/Admin/CustomerExportController.php deleted file mode 100644 index 3215a2106..000000000 --- a/core/lib/Thelia/Controller/Admin/CustomerExportController.php +++ /dev/null @@ -1,36 +0,0 @@ - - */ -class CustomerExportController extends BaseAdminController -{ - public function newsletterSubscribers() - { - - } - - public function customers() - { - - } - - public function mailing() - { - - } -} diff --git a/core/lib/Thelia/Controller/Admin/ExportController.php b/core/lib/Thelia/Controller/Admin/ExportController.php index 73c5cbf1a..767216795 100644 --- a/core/lib/Thelia/Controller/Admin/ExportController.php +++ b/core/lib/Thelia/Controller/Admin/ExportController.php @@ -140,11 +140,11 @@ class ExportController extends BaseAdminController } /** - * @param AbstractFormatter $formatter - * @param ExportHandler $handler - * @param AbstractArchiveBuilder $archiveBuilder - * @param bool $includeImages - * @param bool $includeDocuments + * @param AbstractFormatter $formatter + * @param ExportHandler $handler + * @param AbstractArchiveBuilder $archiveBuilder + * @param bool $includeImages + * @param bool $includeDocuments * @return Response * * Processes an export by returning a response with the export's content. @@ -206,7 +206,7 @@ class ExportController extends BaseAdminController } /** - * @param ImagesExportInterface $handler + * @param ImagesExportInterface $handler * @param AbstractArchiveBuilder $archiveBuilder * * Procedure that add images in the export's archive @@ -224,7 +224,7 @@ class ExportController extends BaseAdminController /** * @param DocumentsExportInterface $handler - * @param AbstractArchiveBuilder $archiveBuilder + * @param AbstractArchiveBuilder $archiveBuilder * * Procedure that add documents in the export's archive */ diff --git a/core/lib/Thelia/Controller/Admin/ImportController.php b/core/lib/Thelia/Controller/Admin/ImportController.php index 9b110375f..a879b308a 100644 --- a/core/lib/Thelia/Controller/Admin/ImportController.php +++ b/core/lib/Thelia/Controller/Admin/ImportController.php @@ -75,7 +75,6 @@ class ImportController extends BaseAdminController $errorMessage = null; $successMessage = null; - try { $boundForm = $this->validateForm($form); @@ -94,7 +93,6 @@ class ImportController extends BaseAdminController $archiveBuilderManager ); - /** @var AbstractArchiveBuilder $archiveBuilder */ $archiveBuilder = $tools["archive_builder"]; @@ -140,9 +138,9 @@ class ImportController extends BaseAdminController $archiveBuilder ); - } catch(FormValidationException $e) { + } catch (FormValidationException $e) { $errorMessage = $this->createStandardFormValidationErrorMessage($e); - } catch(\Exception $e) { + } catch (\Exception $e) { $errorMessage = $e->getMessage(); } @@ -232,11 +230,11 @@ class ImportController extends BaseAdminController try { $formatter = $formatterManager->get($objectName); - } catch(\OutOfBoundsException $e) {} + } catch (\OutOfBoundsException $e) {} try { $archiveBuilder = $archiveBuilderManager->get($objectName); - } catch(\OutOfBoundsException $e) {} + } catch (\OutOfBoundsException $e) {} break; } @@ -305,7 +303,6 @@ class ImportController extends BaseAdminController return $this->getTranslator()->trans("Import successfully done"); } - /** * @param integer $id * @return Response @@ -508,4 +505,4 @@ class ImportController extends BaseAdminController return $category; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php b/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php index 6fb105bba..f00c14193 100644 --- a/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php +++ b/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php @@ -12,7 +12,6 @@ namespace Thelia\Core\DependencyInjection\Loader; -use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Propel; use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\Config\Util\XmlUtils; diff --git a/core/lib/Thelia/Core/Event/ImportExport.php b/core/lib/Thelia/Core/Event/ImportExport.php index b3b0d47d9..14a017d03 100644 --- a/core/lib/Thelia/Core/Event/ImportExport.php +++ b/core/lib/Thelia/Core/Event/ImportExport.php @@ -109,7 +109,7 @@ class ImportExport extends ActionEvent } /** - * @param FormatterData $data + * @param FormatterData $data * @return $this */ public function setData(FormatterData $data) @@ -146,5 +146,4 @@ class ImportExport extends ActionEvent return $this->content; } - } diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php index e872d9e74..176531670 100644 --- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php +++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php @@ -141,7 +141,8 @@ class ArchiveBuilderManager } } - public function getMimeTypes() { + public function getMimeTypes() + { $mimeTypes = []; /** @var AbstractArchiveBuilder $formatter */ diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.php index 616012db8..24c365203 100644 --- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.php +++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.php @@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; trait ArchiveBuilderManagerTrait { /** - * @param ContainerInterface $container + * @param ContainerInterface $container * @return \Thelia\Core\FileFormat\Archive\ArchiveBuilderManager */ public function getArchiveBuilderManager(ContainerInterface $container) diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php b/core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php index 18d28bb78..0935ed07c 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php +++ b/core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php @@ -10,7 +10,7 @@ /* file that was distributed with this source code. */ /*************************************************************************************/ -namespace Thelia\Core\FileFormat\Formatter\Exception; +namespace Thelia\Core\FileFormat\Formatting\Exception; /** * Class BadFormattedStringException diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php b/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php index a6ce7c62c..8d8945d94 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php +++ b/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php @@ -12,7 +12,7 @@ namespace Thelia\Core\FileFormat\Formatting\Formatter; use Symfony\Component\DependencyInjection\SimpleXMLElement; -use Thelia\Core\FileFormat\Formatter\Exception\BadFormattedStringException; +use Thelia\Core\FileFormat\Formatting\Exception\BadFormattedStringException; use Thelia\Core\FileFormat\Formatting\AbstractFormatter; use Thelia\Core\FileFormat\Formatting\FormatterData; use Thelia\Core\FileFormat\FormatType; @@ -165,7 +165,8 @@ class XMLFormatter extends AbstractFormatter return $parent === null ? $data : $parent; } - public function getValue($name, array &$data) { + public function getValue($name, array &$data) + { $value = $data[$name]; unset ($data[$name]); @@ -175,7 +176,7 @@ class XMLFormatter extends AbstractFormatter /** * @param $rawData * @return array - * @throws \Thelia\Core\FileFormat\Formatter\Exception\BadFormattedStringException + * @throws \Thelia\Core\FileFormat\Formatting\Exception\BadFormattedStringException */ public function rawDecode($rawData) { diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php index 90c0c755e..c2984e746 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php +++ b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php @@ -119,7 +119,8 @@ class FormatterManager return $extensions; } - public function getExtensionsByTypes($types, $withDot = false) { + public function getExtensionsByTypes($types, $withDot = false) + { $extensions = []; /** @var AbstractFormatter $formatter */ @@ -174,7 +175,8 @@ class FormatterManager return $selectedFormatters; } - public function getMimeTypesByTypes($types) { + public function getMimeTypesByTypes($types) + { if (!is_array($types)) { $types = [$types]; } diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManagerTrait.php b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManagerTrait.php index 4957550b1..a02e1b400 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManagerTrait.php +++ b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterManagerTrait.php @@ -21,11 +21,11 @@ use Symfony\Component\DependencyInjection\ContainerInterface; trait FormatterManagerTrait { /** - * @param ContainerInterface $container + * @param ContainerInterface $container * @return \Thelia\Core\FileFormat\Formatting\FormatterManager */ public function getFormatterManager(ContainerInterface $container) { return $container->get("thelia.manager.formatter_manager"); } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Core/Template/Loop/ImportExportType.php b/core/lib/Thelia/Core/Template/Loop/ImportExportType.php index cf1567184..e9b472f64 100644 --- a/core/lib/Thelia/Core/Template/Loop/ImportExportType.php +++ b/core/lib/Thelia/Core/Template/Loop/ImportExportType.php @@ -59,10 +59,9 @@ abstract class ImportExportType extends BaseI18nLoop implements PropelSearchLoop ->set("POSITION", $type->getPosition()) ->set("CATEGORY_ID", $type->getByName($this->getCategoryName())) ; - } catch(ClassNotFoundException $e) { - - } catch(\ErrorException $e) {} + } catch (ClassNotFoundException $e) { + } catch (\ErrorException $e) {} $loopResult->addRow($loopResultRow); } diff --git a/core/lib/Thelia/Model/Export.php b/core/lib/Thelia/Model/Export.php index d3e868840..99bb41133 100644 --- a/core/lib/Thelia/Model/Export.php +++ b/core/lib/Thelia/Model/Export.php @@ -163,7 +163,6 @@ class Export extends BaseExport parent::delete($con); } - public function hasImages(ContainerInterface $container) { if (static::$cache === null) { diff --git a/core/lib/Thelia/Model/Import.php b/core/lib/Thelia/Model/Import.php index 58b5e0940..61df4a815 100644 --- a/core/lib/Thelia/Model/Import.php +++ b/core/lib/Thelia/Model/Import.php @@ -6,13 +6,11 @@ use Exception; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Exception\ClassNotFoundException; -use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Propel; use Symfony\Component\DependencyInjection\ContainerInterface; use Thelia\Core\Translation\Translator; use Thelia\ImportExport\Import\ImportHandler; use Thelia\Model\Base\Import as BaseImport; -use Thelia\Model\ImportQuery as ChildImportQuery; use Thelia\Model\Map\ImportTableMap; class Import extends BaseImport @@ -99,7 +97,7 @@ class Import extends BaseImport } /** - * @param ContainerInterface $container + * @param ContainerInterface $container * @return ImportHandler * @throws \ErrorException */ @@ -160,5 +158,4 @@ class Import extends BaseImport parent::delete($con); } - }