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

corrected regex to fit all given enclosures. Added test for single enclosure

Browse Source
This commit is contained in:
Susann Sgorzaly
2018-02-26 08:55:51 +01:00
parent aaefe2a480
commit 68b849a37b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Csv.php
View File

@@ -556,7 +556,7 @@ class Csv {
$this->_detect_and_remove_sep_row_from_data($data); $this->_detect_and_remove_sep_row_from_data($data);
$pattern = sprintf('/("[^%s]*")|[^%s]*/i', $this->enclosure, $this->enclosure); $pattern = sprintf('/(%1$s[^%1$s]*%1$s)/i', $this->enclosure);
preg_match_all($pattern, $data, $matches); preg_match_all($pattern, $data, $matches);
foreach ($matches[0] as $match) { foreach ($matches[0] as $match) {

10
tests/methods/DataRowCountTest.php
View File

@@ -63,4 +63,14 @@ class DataRowCountTest extends TestCase {
$this->csv->load_data($sInput); $this->csv->load_data($sInput);
$this->assertEquals(3, $this->csv->getTotalDataRowCount()); $this->assertEquals(3, $this->csv->getTotalDataRowCount());
} }
public function testGetTotalRowCountSingleEnclosure() {
$this->csv->heading = false;
$this->csv->enclosure = "'";
$sInput = "86545235689,a\r\n34365587654,b\r\n13469874576,\'c\r\nd\'";
$this->csv->load_data($sInput);
$this->assertEquals(3, $this->csv->getTotalDataRowCount());
}
} }