parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 08:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes bug on _validate_fields_for_unparse() if titles property is used instead of fields parameter for changing the titles for unparsing

Browse Source
This commit is contained in:
Susann Sgorzaly
2018-03-11 12:49:24 +01:00
committed by Christian Bläul
parent b7f2075efc
commit 5bc6d09b5e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Csv.php
View File

@@ -828,33 +828,39 @@ class Csv {
} }
private function _validate_fields_for_unparse($fields){ private function _validate_fields_for_unparse($fields){
// this is needed because sometime titles property is overwritten instead of using fields parameter!
$titlesOnParse = !empty($this->data) ? array_keys($this->data[0]) : array();
if (empty($fields)){ if (empty($fields)){
return []; $fields = $this->titles;
}
if (empty($fields)){
return array();
} }
// both are identical, also in ordering // both are identical, also in ordering
if (array_values($fields) === array_values($this->titles)){ if (array_values($fields) === array_values($titlesOnParse)){
return array_combine($fields, $fields); return array_combine($fields, $fields);
} }
// if renaming given by: $oldName => $newName (maybe with reorder and / or subset): // if renaming given by: $oldName => $newName (maybe with reorder and / or subset):
// todo: this will only work if titles are unique // todo: this will only work if titles are unique
$fieldOrder = array_intersect(array_flip($fields), $this->titles); $fieldOrder = array_intersect(array_flip($fields), $titlesOnParse);
if (!empty($fieldOrder)) { if (!empty($fieldOrder)) {
return array_flip($fieldOrder); return array_flip($fieldOrder);
} }
$fieldOrder = array_intersect($fields, $this->titles); $fieldOrder = array_intersect($fields, $titlesOnParse);
if (!empty($fieldOrder)) { if (!empty($fieldOrder)) {
return array_combine($fieldOrder, $fieldOrder); return array_combine($fieldOrder, $fieldOrder);
} }
// original titles are not given in fields. that is okay if count is okay. // original titles are not given in fields. that is okay if count is okay.
if (count($fields) != count($this->titles)) { if (count($fields) != count($titlesOnParse)) {
throw new \UnexpectedValueException('The specified fields do not match any titles and do not match column count.'); throw new \UnexpectedValueException('The specified fields do not match any titles and do not match column count.');
} }
return array_combine($this->titles, $fields); return array_combine($titlesOnParse, $fields);
} }
/** /**