Merge pull request #358 from on2/master

Fatal error with ltrim() when using the EmptyEscapeParser
thephpleague · Oct 9, 2019 · 8effaf0 · 8effaf0
2 parents 0b843fb + beca510
commit 8effaf0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/Polyfill/EmptyEscapeParser.php b/src/Polyfill/EmptyEscapeParser.php
@@ -153,7 +153,10 @@ private static function extractRecord(): array
         self::$line = self::$document->fgets();
         do {
             $method = 'extractFieldContent';
-            $buffer = ltrim(self::$line, self::$trim_mask);
+            $buffer = '';
+            if (false !== self::$line) {
+                $buffer = ltrim(self::$line, self::$trim_mask);
+            }
             if (($buffer[0] ?? '') === self::$enclosure) {
                 $method = 'extractEnclosedFieldContent';
                 self::$line = $buffer;

diff --git a/tests/Polyfill/EmptyEscapeParserTest.php b/tests/Polyfill/EmptyEscapeParserTest.php
@@ -124,6 +124,25 @@ public function testPreserveEmptyLines()
         }
     }
 
+    /**
+     * @covers ::parse
+     * @covers ::extractRecord
+     * @covers ::extractFieldContent
+     * @covers ::extractEnclosedFieldContent
+     */
+    public function testReadingOnlyStream()
+    {
+        $expected = [
+            ['john', 'doe', '[email protected]'],
+            [null],
+        ];
+
+        $stream = Stream::createFromPath(__DIR__.'/../data/foo_readonly.csv');
+        foreach (EmptyEscapeParser::parse($stream) as $offset => $record) {
+            self::assertSame($expected[$offset], $record);
+        }
+    }
+
     /**
      * @covers ::parse
      * @covers ::extractRecord