supprimé:        core/lib/Thelia/Controller/Admin/CustomerExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/Event/ImportExport.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManagerTrait.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManagerTrait.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
This commit is contained in:
Benjamin Perche
2014-07-18 14:35:07 +02:00
parent 4c165bc5d5
commit 0723f30695
14 changed files with 30 additions and 72 deletions

View File

@@ -1,36 +0,0 @@
<?php
/*************************************************************************************/
/* This file is part of the Thelia package. */
/* */
/* Copyright (c) OpenStudio */
/* email : dev@thelia.net */
/* web : http://www.thelia.net */
/* */
/* For the full copyright and license information, please view the LICENSE.txt */
/* file that was distributed with this source code. */
/*************************************************************************************/
namespace Thelia\Controller\Admin;
/**
* Class CustomerExportController
* @package Thelia\Controller\Admin
* @author Manuel Raynaud <mraynaud@openstudio.fr>
*/
class CustomerExportController extends BaseAdminController
{
public function newsletterSubscribers()
{
}
public function customers()
{
}
public function mailing()
{
}
}

View File

@@ -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
*/

View File

@@ -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;
}
}
}