From 32d8d2051d4dca4eb1cbaf7f22ba64d10f1d9705 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Fri, 18 Jul 2014 08:19:42 +0200
Subject: [PATCH] =?UTF-8?q?Finish=20basic=20import=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/FileFormat/Formatting/Formatter/XMLFormatter.?=
 =?UTF-8?q?php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Theli?=
 =?UTF-8?q?a/Core/FileFormat/Formatting/FormatterData.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/lib/Thelia/Controller/Admin/ImportController.php         | 4 ++--
 .../Core/FileFormat/Formatting/Formatter/XMLFormatter.php     | 2 +-
 core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Controller/Admin/ImportController.php b/core/lib/Thelia/Controller/Admin/ImportController.php
index 2ee8958ae..545ba8b6d 100644
--- a/core/lib/Thelia/Controller/Admin/ImportController.php
+++ b/core/lib/Thelia/Controller/Admin/ImportController.php
@@ -141,7 +141,7 @@ class ImportController extends BaseAdminController
                 /**
                  * If the file is an archive
                  */
-                $archiveBuilder->loadArchive($file->getPathname());
+                $archiveBuilder = $archiveBuilder->loadArchive($file->getPathname());
                 $content = null;
 
                 /**
@@ -193,7 +193,7 @@ class ImportController extends BaseAdminController
 
             $this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event);
 
-            $data = $formatter->decode($content);
+            $data = $formatter->decode($event->getContent());
 
             $event->setContent(null)->setData($data);
             $this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event);
diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php b/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
index 9351ebe7f..e445e3b32 100644
--- a/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
+++ b/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
@@ -152,7 +152,7 @@ class XMLFormatter extends AbstractFormatter
             unset($array[$this->nodeName]);
         }
 
-        $data = new FormatterData($this->getAliases());
+        $data = new FormatterData();
 
         return $data->setData($array);
     }
diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
index a4f494775..992713ef3 100644
--- a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
+++ b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
@@ -139,7 +139,7 @@ class FormatterData
      * @param array $data
      * @param array $aliases
      */
-    protected function applyAliases(array $data, array $aliases)
+    public function applyAliases(array $data, array $aliases)
     {
         $formattedData = [];