add stream support to Reader/Csv

PHPOffice · Oct 5, 2023 · ade8ec1 · ade8ec1
1 parent 4cca3ef
commit ade8ec1
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 21 deletions.
diff --git a/src/PhpSpreadsheet/Reader/BaseReader.php b/src/PhpSpreadsheet/Reader/BaseReader.php
@@ -188,16 +188,17 @@ public function load($file, int $flags = 0): Spreadsheet
      */
     protected function openFile($file): void
     {
-        $fileHandle = false;
         if (is_string($file)) {
             $filename = $file;
             File::assertFile($file);
 
             // Open file
             $fileHandle = fopen($file, 'rb');
-        } else {
+        } else if (is_resource($file)) {
             $filename = 'stream';
             $fileHandle = $file;
+        } else {
+            throw new ReaderException('invalid type for file. Only file path or a stream resource is allowed');
         }
         if ($fileHandle === false) {
             throw new ReaderException('Could not open file ' . $filename . ' for reading.');

diff --git a/src/PhpSpreadsheet/Reader/Csv.php b/src/PhpSpreadsheet/Reader/Csv.php
@@ -276,20 +276,18 @@ public function loadSpreadsheetFromString(string $contents): Spreadsheet
         return $this->loadStringOrFile('data://text/plain,' . urlencode($contents), $spreadsheet, true);
     }
 
-    private function openFileOrMemory(string $filename): void
+    private function openFileOrMemory($file): void
     {
         // Open file
-        $fhandle = $this->canRead($filename);
-        if (!$fhandle) {
-            throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+        if (!$this->canRead($file)) {
+            throw new Exception($file . ' is an Invalid Spreadsheet file.');
         }
         if ($this->inputEncoding === self::GUESS_ENCODING) {
-            $this->inputEncoding = self::guessEncoding($filename, $this->fallbackEncoding);
+            $this->inputEncoding = self::guessEncoding($file, $this->fallbackEncoding);
         }
-        $this->openFile($filename);
+        $this->openFile($file);
         if ($this->inputEncoding !== 'UTF-8') {
-            fclose($this->fileHandle);
-            $entireFile = file_get_contents($filename);
+            $entireFile = stream_get_contents($this->fileHandle);
             $fileHandle = fopen('php://memory', 'r+b');
             if ($fileHandle !== false && $entireFile !== false) {
                 $this->fileHandle = $fileHandle;
@@ -346,24 +344,26 @@ private function openDataUri(string $filename): void
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
      */
-    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
+    public function loadIntoExisting($file, Spreadsheet $spreadsheet): Spreadsheet
     {
-        return $this->loadStringOrFile($filename, $spreadsheet, false);
+        return $this->loadStringOrFile($file, $spreadsheet, false);
     }
 
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
      */
-    private function loadStringOrFile(string $filename, Spreadsheet $spreadsheet, bool $dataUri): Spreadsheet
+    private function loadStringOrFile($file, Spreadsheet $spreadsheet, bool $dataUri): Spreadsheet
     {
         // Deprecated in Php8.1
         $iniset = $this->setAutoDetect('1');
 
         // Open file
         if ($dataUri) {
-            $this->openDataUri($filename);
+            $this->openDataUri($file);
+            $filename = $file;
         } else {
-            $this->openFileOrMemory($filename);
+            $this->openFileOrMemory($file);
+            $filename = 'escape';
         }
         $fileHandle = $this->fileHandle;
 
@@ -548,23 +548,33 @@ public function canRead($file): bool
             return false;
         }
 
-        fclose($this->fileHandle);
+        rewind($this->fileHandle);
 
-        // Trust file extension if any
-        $extension = strtolower(pathinfo($file, PATHINFO_EXTENSION));
-        if (in_array($extension, ['csv', 'tsv'])) {
-            return true;
+        if (is_string($file)) {
+            // Trust file extension if any
+            $extension = strtolower(pathinfo($file, PATHINFO_EXTENSION));
+            if (in_array($extension, ['csv', 'tsv'])) {
+                return true;
+            }
         }
 
         // Attempt to guess mimetype
-        $type = mime_content_type($file);
+        $type = mime_content_type($this->fileHandle);
         $supportedTypes = [
             'application/csv',
             'text/csv',
             'text/plain',
             'inode/x-empty',
         ];
 
+        if (is_resource($file)) {
+            // reading mime types from a stream causes sometimes different results
+            $supportedTypes[] = 'application/x-empty';
+            $supportedTypes[] = 'text/html';
+        }
+
+        rewind($this->fileHandle);
+
         return in_array($type, $supportedTypes, true);
     }
 

diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvLoadFromStringTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvLoadFromStringTest.php
@@ -25,4 +25,22 @@ public function testLoadFromString(): void
         self::AssertSame('7 , 8', $sheet->getCell('A3')->getValue());
         self::AssertSame("12\n13", $sheet->getCell('B4')->getValue());
     }
+
+    public function testLoadFromStream(): void
+    {
+        $data = <<<EOF
+            1,2,3
+            4,2+3,6
+            "7 , 8", 9, 10
+            11,"12
+            13",14
+            EOF;
+        $stream = fopen('data://text/plain;base64,' . base64_encode($data), 'r');
+        $reader = new Csv();
+        $spreadsheet = $reader->load($stream);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::AssertSame('2+3', $sheet->getCell('B2')->getValue());
+        self::AssertSame('7 , 8', $sheet->getCell('A3')->getValue());
+        self::AssertSame("12\n13", $sheet->getCell('B4')->getValue());
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php
@@ -96,6 +96,23 @@ public function testCanLoad(bool $expected, string $filename): void
         self::assertSame($expected, $reader->canRead($filename));
     }
 
+    /**
+     * @dataProvider providerCanLoad
+     */
+    public function testCanLoadFromStream(bool $expected, string $filename): void
+    {
+        $reader = new Csv();
+        $stream = fopen('php://memory', 'r+');
+        self::assertNotFalse($stream);
+
+        $contents = file_get_contents($filename);
+        self::assertNotFalse($contents);
+        fwrite($stream, $contents);
+        rewind($stream);
+
+        self::assertSame($expected, $reader->canRead($stream));
+    }
+
     public static function providerCanLoad(): array
     {
         return [