Merge pull request #47 from keboola/ondra-fix-empty-enclosure

Fix empty enclosure

Author: ondrajodas

composer.json

@@ -32,7 +32,8 @@
         "keboola/coding-standard": "^13.0",
         "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpstan/phpstan": "^1.4",
-        "phpunit/phpunit": ">=7.5"
+        "phpunit/phpunit": ">=7.5",
+        "phpstan/phpdoc-parser": "1.5.*"
     },
     "scripts": {
         "phpstan": "phpstan analyse ./src ./tests --level=max --no-progress -c phpstan.neon",

phpstan-baseline.neon

@@ -65,11 +65,6 @@ parameters:
 			count: 1
 			path: src/CsvReader.php
 
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(\\$fileName\\)\\: Unexpected token \"\\$fileName\", expected type at offset 18$#"
-			count: 1
-			path: src/CsvReader.php
-
 		-
 			message: "#^Parameter \\#1 \\$header of static method Keboola\\\\Csv\\\\UTF8BOMHelper\\:\\:detectAndRemoveBOM\\(\\) expects array, array\\|false\\|null given\\.$#"
 			count: 1

src/LineBreaksHelper.php

@@ -53,6 +53,10 @@ public static function detectLineBreaks($sample, $enclosure, $escapedBy)
      */
     public static function clearCsvValues($sample, $enclosure, $escapedBy)
     {
+        if (empty($enclosure)) {
+            return $sample;
+        }
+
         // Usually an enclosure character is escaped by doubling it, however, the escapeBy can be used
         $doubleEnclosure = $enclosure . $enclosure;
         $escapedEnclosure = empty($escapedBy) ? $doubleEnclosure : $escapedBy . $enclosure;

tests/LineBreaksHelperTest.php

@@ -50,6 +50,14 @@ public function getDataSet()
             "\n",
         ];
 
+        yield 'empty-enclosure' => [
+            '',
+            '',
+            'col1|col2',
+            'col1|col2',
+            "\n",
+        ];
+
         yield 'empty-escaped-by' => [
             '"',
             '\\',
@@ -59,6 +67,20 @@ public function getDataSet()
         ];
 
         foreach ($lineEnds as $prefix => $lineEnd) {
+            yield "$prefix-empty-enclosure" => [
+                '',
+                '',
+                implode($lineEnd, [
+                    'col1,col2',
+                    'abc,def',
+                ]),
+                implode($lineEnd, [
+                    'col1,col2',
+                    'abc,def',
+                ]),
+                $lineEnd,
+            ];
+
             yield "$prefix-simple" => [
                 '"',
                 '',