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

Set $data field on unparse. This fixes issue #132.

Browse Source
This commit is contained in:
Fonata
2018-03-17 12:14:04 +01:00
parent 07846d33c1
commit f5ff7332a4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Csv.php
View File

@@ -783,6 +783,9 @@ class Csv {
public function unparse($data = array(), $fields = array(), $append = FileProcessingModeEnum::MODE_FILE_OVERWRITE, $is_php = false, $delimiter = null) { public function unparse($data = array(), $fields = array(), $append = FileProcessingModeEnum::MODE_FILE_OVERWRITE, $is_php = false, $delimiter = null) {
if (!is_array($data) || empty($data)) { if (!is_array($data) || empty($data)) {
$data = &$this->data; $data = &$this->data;
} else {
/** @noinspection ReferenceMismatchInspection */
$this->data = $data;
} }
if (!is_array($fields) || empty($fields)) { if (!is_array($fields) || empty($fields)) {
@@ -833,8 +836,6 @@ 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)) {
$fields = $this->titles; $fields = $this->titles;
} }
@@ -843,6 +844,9 @@ class Csv {
return array(); return array();
} }
// this is needed because sometime titles property is overwritten instead of using fields parameter!
$titlesOnParse = !empty($this->data) ? array_keys($this->data[0]) : array();
// both are identical, also in ordering // both are identical, also in ordering
if (array_values($fields) === array_values($titlesOnParse)) { if (array_values($fields) === array_values($titlesOnParse)) {
return array_combine($fields, $fields); return array_combine($fields, $fields);