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

@@ -163,7 +163,6 @@ class Export extends BaseExport
parent::delete($con);
}
public function hasImages(ContainerInterface $container)
{
if (static::$cache === null) {

View File

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