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

Fix usage

Browse Source 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
This commit is contained in:
Benjamin Perche
2014-08-01 16:30:06 +02:00
parent 81454c047d
commit df27aff534
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
View File

@@ -84,7 +84,7 @@ class CSVFormatter extends AbstractFormatter
$delimiterLength = strlen($this->delimiter);
$lineReturnLength = strlen($this->lineReturn);
if ($firstRow === null) {
if ($firstRow === false) {
return "";
}
@@ -93,43 +93,38 @@ class CSVFormatter extends AbstractFormatter
*/
$this->checkOrders($firstRow);
if (false !== $firstRow) {
$rawKeys = array_keys($firstRow);
$keys = [];
$rawKeys = array_keys($firstRow);
$keys = [];
foreach ($rawKeys as $key) {
$keys[$key] = $key;
foreach ($rawKeys as $key) {
$keys[$key] = $key;
}
$values = $data->getData();
array_unshift($values, $keys);
while (null !== $row = array_shift($values)) {
/**
* First put the sorted ones
*/
foreach ($this->order as $order) {
$string .= $this->formatField($row[$order]);
unset($row[$order]);
}
$values = $data->getData();
array_unshift($values, $keys);
/**
* Then place the fields,
* order by name
*/
ksort($row);
while (null !== $row = array_shift($values)) {
/**
* First put the sorted ones
*/
foreach ($this->order as $order) {
$string .= $this->formatField($row[$order]);
unset($row[$order]);
foreach ($keys as $key) {
if (array_key_exists($key, $row)) {
$string .= $this->formatField($row[$key]);
}
/**
* Then place the fields,
* order by name
*/
ksort($row);
foreach ($keys as $key) {
if (array_key_exists($key, $row)) {
$string .= $this->formatField($row[$key]);
}
}
$string = substr($string,0, -$delimiterLength) . $this->lineReturn;
}
} else {
$lineReturnLength = 0;
$string = substr($string,0, -$delimiterLength) . $this->lineReturn;
}
return substr($string, 0, -$lineReturnLength);