summaryrefslogtreecommitdiffstats
path: root/531.patch
blob: 9ef28fb4dc3829acb7423152fbe89bd98213e30a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
From c8f5a888cb304e8f369ff139964cd923ef3c722b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 30 Sep 2024 08:14:43 +0200
Subject: [PATCH] fetcsv default values are deprecated with 8.4

---
 tests/xlsx_to_csv_callback.phpt                  | 6 +++---
 tests/xlsx_to_csv_callback_custom_delimiter.phpt | 4 ++--
 tests/xlsx_to_csv_custom_delimiter.phpt          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/xlsx_to_csv_callback.phpt b/tests/xlsx_to_csv_callback.phpt
index 81d1bdb..eea603e 100644
--- 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"
-}
\ No newline at end of file
+}
diff --git a/tests/xlsx_to_csv_callback_custom_delimiter.phpt b/tests/xlsx_to_csv_callback_custom_delimiter.phpt
index 2a46550..d02cf22 100644
--- 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"
-}
\ No newline at end of file
+}
diff --git a/tests/xlsx_to_csv_custom_delimiter.phpt b/tests/xlsx_to_csv_custom_delimiter.phpt
index 5fb749c..0e86053 100644
--- 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);
 }
 ?>