TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish basic import

Browse Source 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
This commit is contained in:
Benjamin Perche
2014-07-18 08:19:42 +02:00
parent cb75c13716
commit 32d8d2051d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Controller/Admin/ImportController.php
View File

@@ -141,7 +141,7 @@ class ImportController extends BaseAdminController
/** /**
* If the file is an archive * If the file is an archive
*/ */
$archiveBuilder->loadArchive($file->getPathname()); $archiveBuilder = $archiveBuilder->loadArchive($file->getPathname());
$content = null; $content = null;
/** /**
@@ -193,7 +193,7 @@ class ImportController extends BaseAdminController
$this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event); $this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event);
$data = $formatter->decode($content); $data = $formatter->decode($event->getContent());
$event->setContent(null)->setData($data); $event->setContent(null)->setData($data);
$this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event); $this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event);

2
core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
View File

@@ -152,7 +152,7 @@ class XMLFormatter extends AbstractFormatter
unset($array[$this->nodeName]); unset($array[$this->nodeName]);
} }
$data = new FormatterData($this->getAliases()); $data = new FormatterData();
return $data->setData($array); return $data->setData($array);
} }

2
core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
View File

@@ -139,7 +139,7 @@ class FormatterData
* @param array $data * @param array $data
* @param array $aliases * @param array $aliases
*/ */
protected function applyAliases(array $data, array $aliases) public function applyAliases(array $data, array $aliases)
{ {
$formattedData = []; $formattedData = [];