Merge pull request #48 from derrabus/bugfix/php-8

Fix tests on PHP 8
keboola · Apr 4, 2023 · 3e9f4f8 · 3e9f4f8
2 parents ea1e00e + 151d3e0
commit 3e9f4f8
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/src/CsvReader.php b/src/CsvReader.php
@@ -5,6 +5,7 @@
 namespace Keboola\Csv;
 
 use Iterator;
+use ReturnTypeWillChange;
 
 class CsvReader extends AbstractCsvFile implements Iterator
 {
@@ -169,6 +170,7 @@ public function getLineBreak()
     /**
      * @inheritdoc
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         rewind($this->getFilePointer());
@@ -217,6 +219,7 @@ public function getLineBreakAsText()
     /**
      * @inheritdoc
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this->currentRow;
@@ -225,6 +228,7 @@ public function current()
     /**
      * @inheritdoc
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         $this->currentRow = $this->readLine();
@@ -234,6 +238,7 @@ public function next()
     /**
      * @inheritdoc
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->rowCounter;
@@ -242,6 +247,7 @@ public function key()
     /**
      * @inheritdoc
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return $this->currentRow !== false;

diff --git a/src/CsvWriter.php b/src/CsvWriter.php
@@ -2,6 +2,9 @@
 
 namespace Keboola\Csv;
 
+use TypeError;
+use ValueError;
+
 class CsvWriter extends AbstractCsvFile
 {
     /**
@@ -63,7 +66,16 @@ private function validateLineBreak($lineBreak)
      */
     protected function openCsvFile($fileName)
     {
-        $this->filePointer = @fopen($fileName, 'w');
+        try {
+            $this->filePointer = @fopen($fileName, 'w');
+        } catch (ValueError $e) {
+            throw new Exception(
+                "Cannot open file {$fileName} " . $e->getMessage(),
+                Exception::FILE_NOT_EXISTS,
+                $e
+            );
+        }
+
         if (!$this->filePointer) {
             throw new Exception(
                 "Cannot open file {$fileName} " . error_get_last()['message'],
@@ -79,7 +91,18 @@ protected function openCsvFile($fileName)
     public function writeRow(array $row)
     {
         $str = $this->rowToStr($row);
-        $ret = @fwrite($this->getFilePointer(), $str);
+        try {
+            $ret = @fwrite($this->getFilePointer(), $str);
+        } catch (TypeError $e) {
+            throw new Exception(
+                'Cannot write to CSV file ' . $this->fileName .
+                'Error: ' . $e->getMessage() .
+                ' Return: false' .
+                ' To write: ' . strlen($str) . ' Written: 0',
+                Exception::WRITE_ERROR,
+                $e
+            );
+        }
 
         /* According to http://php.net/fwrite the fwrite() function
          should return false on error. However not writing the full

diff --git a/tests/CsvWriteTest.php b/tests/CsvWriteTest.php
@@ -150,9 +150,16 @@ public function testInvalidFileName($filename, $message)
 
     public function invalidFileNameProvider()
     {
+        if (PHP_VERSION_ID < 80000) {
+            return [
+                ['', 'Filename cannot be empty'],
+                ["\0", 'fopen() expects parameter 1 to be a valid path, string given'],
+            ];
+        }
+
         return [
-            ['', 'Filename cannot be empty'],
-            ["\0", 'fopen() expects parameter 1 to be a valid path, string given'],
+            ['', 'Path cannot be empty'],
+            ["\0", 'Argument #1 ($filename) must not contain any null bytes'],
         ];
     }
 
@@ -212,6 +219,10 @@ public function testInvalidPointer()
                     'Cannot write to CSV file Error: fwrite(): ' .
                     'write of 14 bytes failed with errno=9 Bad file descriptor Return: false To write: 14 Written: 0'
                 ),
+                new StringContains(
+                    'Cannot write to CSV file Error: fwrite(): ' .
+                    'Write of 14 bytes failed with errno=9 Bad file descriptor Return: false To write: 14 Written: 0'
+                )
             ]);
             self::assertThat($e->getMessage(), $or);
         }