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

Fix tests and bugs

Browse Source 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
This commit is contained in:
Benjamin Perche
2014-07-25 08:50:16 +02:00
parent f73703c578
commit 7adc31514e
5 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
View File

@@ -31,7 +31,7 @@ abstract class AbstractFormatter implements FormatInterface, FormatterInterface
protected $logger;
/** @var array */
protected $order;
protected $order = array();
public function __construct()
{
@@ -54,7 +54,7 @@ abstract class AbstractFormatter implements FormatInterface, FormatterInterface
public function checkOrders(array $values)
{
foreach ($this->order as $order) {
foreach ($this->getOrder() as $order) {
if (!array_key_exists($order, $values)) {
throw new \ErrorException(
$this->translator->trans(

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

@@ -77,12 +77,6 @@ class FormatterData
*/
public function setData(array $data)
{
if (empty($this->aliases)) {
$this->data = $data;
return $this;
}
$this->data = $this->applyAliases($data, $this->aliases);
return $this;