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

introduces new local variable that holds the data

Browse Source
This commit is contained in:
Susann Sgorzaly
2018-02-26 08:50:35 +01:00
parent 611b1a92e8
commit aaefe2a480
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Csv.php
View File

@@ -552,10 +552,12 @@ class Csv {
return false; return false;
} }
$this->_detect_and_remove_sep_row_from_data($this->file_data); $data = $this->file_data;
$this->_detect_and_remove_sep_row_from_data($data);
$pattern = sprintf('/("[^%s]*")|[^%s]*/i', $this->enclosure, $this->enclosure); $pattern = sprintf('/("[^%s]*")|[^%s]*/i', $this->enclosure, $this->enclosure);
preg_match_all($pattern, $this->file_data, $matches); preg_match_all($pattern, $data, $matches);
foreach ($matches[0] as $match) { foreach ($matches[0] as $match) {
if (empty($match) || (strpos($match, $this->enclosure) === false)) { if (empty($match) || (strpos($match, $this->enclosure) === false)) {
@@ -563,14 +565,14 @@ class Csv {
} }
$replace = str_replace(["\r", "\n"], '', $match); $replace = str_replace(["\r", "\n"], '', $match);
$this->file_data = str_replace($match, $replace, $this->file_data); $data = str_replace($match, $replace, $data);
} }
$headingRow = $this->heading ? 1 : 0; $headingRow = $this->heading ? 1 : 0;
$count = substr_count($this->file_data, "\r") $count = substr_count($data, "\r")
+ substr_count($this->file_data, "\n") + substr_count($data, "\n")
- substr_count($this->file_data, "\r\n") - substr_count($data, "\r\n")
- $headingRow; - $headingRow;