Ignore escaped enclosures within an enclosure when inferring csv separator (#906)

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Added support for inline styles in Html reader (borders, alignment, width, height)
 - QuotedText cells no longer treated as formulae if the content begins with a `=`
 - Clean handling for DDE in formulae
+- Fix handling for escaped enclosures and new lines in CSV Separator Inference
 
 ## [1.6.0] - 2019-01-02
 

src/PhpSpreadsheet/Reader/Csv.php

@@ -254,8 +254,8 @@ class Csv extends BaseReader
         $line = $line . $newLine;
 
         // Drop everything that is enclosed to avoid counting false positives in enclosures
-        $enclosure = preg_quote($this->enclosure, '/');
-        // Add 's' to the replace rule in order for '.' to also match newline.
+        $enclosure = '(?<!' . preg_quote($this->escapeCharacter, '/') . ')'
+            . preg_quote($this->enclosure, '/');
         $line = preg_replace('/(' . $enclosure . '.*' . $enclosure . ')/Us', '', $line);
 
         // See if we have any enclosures left in the line

tests/PhpSpreadsheetTests/Reader/CsvTest.php

@@ -49,6 +49,12 @@ class CsvTest extends TestCase
                 'A3',
                 'Test',
             ],
+            [
+                __DIR__ . '/../../data/Reader/CSV/line_break_in_enclosure_with_escaped_quotes.csv',
+                ',',
+                'A3',
+                'Test',
+            ],
             [
                 __DIR__ . '/../../data/Reader/HTML/csv_with_angle_bracket.csv',
                 ',',

tests/data/Reader/CSV/line_break_in_enclosure_with_escaped_quotes.csv

@@ -0,0 +1,21 @@
+Name,Copy,URL
+Test,"This is a \"test csv file\"
+with both \"line breaks\"
+and \"escaped
+quotes\" that breaks
+the delimiters",http://google.com
+Test,"This is a \"test csv file\"
+with both \"line breaks\"
+and \"escaped
+quotes\" that breaks
+the delimiters",http://google.com
+Test,"This is a \"test csv file\"
+with both \"line breaks\"
+and \"escaped
+quotes\" that breaks
+the delimiters",http://google.com
+Test,"This is a \"test csv file\"
+with both \"line breaks\"
+and \"escaped
+quotes\" that breaks
+the delimiters",http://google.com