summaryrefslogtreecommitdiffstats
path: root/531.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-09-30 08:19:11 +0200
committerRemi Collet <remi@php.net>2024-09-30 08:19:11 +0200
commit98401e5cab507e4014c43e10c729dac0e86b0c6c (patch)
treeb5432d4f8052f42666bc9d7828d71ff297ab7d44 /531.patch
parente152056300f1c179616559e27fbf6f5f16c83ee5 (diff)
fix test suite using patch fromHEADmaster
https://github.com/viest/php-ext-xlswriter/pull/531
Diffstat (limited to '531.patch')
-rw-r--r--531.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/531.patch b/531.patch
new file mode 100644
index 0000000..9ef28fb
--- /dev/null
+++ b/531.patch
@@ -0,0 +1,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);
+ }
+ ?>