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

Only reformatted the source code

Browse Source
This commit is contained in:
Fonata
2018-03-17 10:31:09 +01:00
parent e4c9fed6cf
commit 49728a74bb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Csv.php
View File

@@ -811,7 +811,7 @@ class Csv {
// create data // create data
foreach ($data as $key => $row) { foreach ($data as $key => $row) {
foreach (array_keys($fieldOrder) as $index){ foreach (array_keys($fieldOrder) as $index) {
$cell_value = $row[$index]; $cell_value = $row[$index];
$entry[] = $this->_enclose_value($cell_value, $delimiter); $entry[] = $this->_enclose_value($cell_value, $delimiter);
} }
@@ -827,19 +827,19 @@ class Csv {
return $string; return $string;
} }
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! // this is needed because sometime titles property is overwritten instead of using fields parameter!
$titlesOnParse = !empty($this->data) ? array_keys($this->data[0]) : array(); $titlesOnParse = !empty($this->data) ? array_keys($this->data[0]) : array();
if (empty($fields)){ if (empty($fields)) {
$fields = $this->titles; $fields = $this->titles;
} }
if (empty($fields)){ if (empty($fields)) {
return array(); return 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);
} }