Merge pull request #50 from keboola/adamvyborny-COM-1714

Empty header
keboola · Nov 2, 2022 · ea1e00e · ea1e00e
2 parents 82cc689 + 9d079e4
commit ea1e00e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -215,11 +215,6 @@ parameters:
 			count: 1
 			path: tests/CsvReadTest.php
 
-		-
-			message: "#^Method Keboola\\\\Csv\\\\Tests\\\\CsvReadTest\\:\\:testEmptyHeader\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/CsvReadTest.php
-
 		-
 			message: "#^Method Keboola\\\\Csv\\\\Tests\\\\CsvReadTest\\:\\:testException\\(\\) has no return type specified\\.$#"
 			count: 1

diff --git a/src/CsvReader.php b/src/CsvReader.php
@@ -62,7 +62,11 @@ public function __construct(
         $this->validateLineBreak();
 
         rewind($this->filePointer);
-        $this->header = UTF8BOMHelper::detectAndRemoveBOM($this->readLine());
+        $header = UTF8BOMHelper::detectAndRemoveBOM($this->readLine());
+        if (is_array($header) && $header[0] === null) {
+            $header = [];
+        }
+        $this->header = $header;
         $this->rewind();
     }
 

diff --git a/src/UTF8BOMHelper.php b/src/UTF8BOMHelper.php
@@ -12,7 +12,7 @@ class UTF8BOMHelper
      */
     public static function detectAndRemoveBOM($header)
     {
-        if (!is_array($header)) {
+        if (!is_array($header) || empty($header) || $header[0] === null) {
             return $header;
         }
         $utf32BigEndianBom = chr(0x00) . chr(0x00) . chr(0xFE) . chr(0xFF);

diff --git a/tests/CsvReadTest.php b/tests/CsvReadTest.php
@@ -175,12 +175,18 @@ public function testParseMacLineEndsInField()
     }
 
 
-    public function testEmptyHeader()
+    public function testEmptyCsv(): void
     {
         $csvFile = new CsvReader(__DIR__ . '/data/test-input.empty.csv', ',', '"');
         self::assertEquals([], $csvFile->getHeader());
     }
 
+    public function testEmptyHeader(): void
+    {
+        $csvFile = new CsvReader(__DIR__ . '/data/test-input.emptyHeader.csv', ',', '"');
+        self::assertEquals([], $csvFile->getHeader());
+    }
+
     public function testInitInvalidFileShouldThrowException()
     {
         $this->expectException(Exception::class);

diff --git a/tests/UTF8BOMHelperTest.php b/tests/UTF8BOMHelperTest.php
@@ -23,6 +23,13 @@ public function testDetectAndRemoveBOM($bomFile)
         $this->assertSame(['id', 'name'], UTF8BOMHelper::detectAndRemoveBOM($firstLine));
     }
 
+    public function testDetectAndRemoveBOMEdgeCases(): void
+    {
+        $this->assertSame([null], UTF8BOMHelper::detectAndRemoveBOM([null]));
+        $this->assertSame([], UTF8BOMHelper::detectAndRemoveBOM([]));
+        $this->assertSame(null, UTF8BOMHelper::detectAndRemoveBOM(null)); // @phpstan-ignore-line
+    }
+
     public function bomProvider()
     {
         return [

diff --git a/tests/data/test-input.emptyHeader.csv b/tests/data/test-input.emptyHeader.csv
@@ -0,0 +1,2 @@
+
+"ffff","fff","ffff"