Merge pull request #531 from remicollet/issue-php84

fgetcsv default values are deprecated with 8.4
viest · Oct 7, 2024 · d1571c5 · d1571c5
2 parents 33070cd + 45ddb5e
commit d1571c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tests/xlsx_to_csv_callback.phpt b/tests/xlsx_to_csv_callback.phpt
@@ -30,8 +30,8 @@ var_dump($csvResult);
 
 $fp = fopen('./tests/file.csv', 'r');
 
-var_dump(fgetcsv($fp));
-var_dump(fgetcsv($fp));
+var_dump(fgetcsv($fp, 1000, ',', '"', '\\'));
+var_dump(fgetcsv($fp, 1000, ',', '"', '\\'));
 ?>
 --CLEAN--
 <?php
@@ -55,4 +55,4 @@ array(4) {
   string(2) "10"
   [3]=>
   string(10) "10.9999995"
-}
+}
diff --git a/tests/xlsx_to_csv_callback_custom_delimiter.phpt b/tests/xlsx_to_csv_callback_custom_delimiter.phpt
@@ -30,7 +30,7 @@ if (($csvHandler = fopen('./tests/file.csv', 'r')) === FALSE) {
     die('csv file open failure');
 }
 
-while (($data = fgetcsv($csvHandler, 1000, ';')) !== FALSE) {
+while (($data = fgetcsv($csvHandler, 1000, ';', '"', '\\')) !== FALSE) {
     var_dump($data);
 }
 ?>
@@ -56,4 +56,4 @@ array(4) {
   string(2) "10"
   [3]=>
   string(10) "10.9999995"
-}
+}
diff --git a/tests/xlsx_to_csv_custom_delimiter.phpt b/tests/xlsx_to_csv_custom_delimiter.phpt
@@ -28,7 +28,7 @@ if (($csvHandler = fopen('./tests/file.csv', 'r')) === FALSE) {
     die('csv file open failure');
 }
 
-while (($data = fgetcsv($csvHandler, 1000, ';')) !== FALSE) {
+while (($data = fgetcsv($csvHandler, 1000, ';', '"', '\\')) !== FALSE) {
     var_dump($data);
 }
 ?>