alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support CSV files with data wrapping a lot of lines 

If there is "line" splited on lot of lines we can reach limit of recursion
nesting. It's better to use while instead of recursion.

Closes #1468
This commit is contained in:
drewblin 2020-05-12 11:17:07 +03:00 committed by Adrien Crivelli
parent c4931de1f9
commit 3090c1e73f
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
### Added
- Support writing to streams in all writers [#1292](https://github.com/PHPOffice/PhpSpreadsheet/issues/1292)
- Support CSV files with data wrapping a lot of lines [#1468](https://github.com/PHPOffice/PhpSpreadsheet/pull/1468)
### Fixed

40
src/PhpSpreadsheet/Reader/Csv.php
View File

@ -236,33 +236,31 @@ class Csv extends BaseReader
/**
* Get the next full line from the file.
*
* @param string $line
*
* @return bool|string
* @return false|string
*/
private function getNextLine($line = '')
private function getNextLine()
{
// Get the next line in the file
$newLine = fgets($this->fileHandle);
$line = '';
$enclosure = '(?<!' . preg_quote($this->escapeCharacter, '/') . ')' . preg_quote($this->enclosure, '/');
// Return false if there is no next line
if ($newLine === false) {
return false;
}
do {
// Get the next line in the file
$newLine = fgets($this->fileHandle);
// Add the new line to the line passed in
$line = $line . $newLine;
// Return false if there is no next line
if ($newLine === false) {
return false;
}
// Drop everything that is enclosed to avoid counting false positives in enclosures
$enclosure = '(?<!' . preg_quote($this->escapeCharacter, '/') . ')'
. preg_quote($this->enclosure, '/');
$line = preg_replace('/(' . $enclosure . '.*' . $enclosure . ')/Us', '', $line);
// Add the new line to the line passed in
$line = $line . $newLine;
// See if we have any enclosures left in the line
// if we still have an enclosure then we need to read the next line as well
if (preg_match('/(' . $enclosure . ')/', $line) > 0) {
$line = $this->getNextLine($line);
}
// Drop everything that is enclosed to avoid counting false positives in enclosures
$line = preg_replace('/(' . $enclosure . '.*' . $enclosure . ')/Us', '', $line);
// See if we have any enclosures left in the line
// if we still have an enclosure then we need to read the next line as well
} while (preg_match('/(' . $enclosure . ')/', $line) > 0);
return $line;
}