From 9af7b441418e52d5110feeb5ce4747bcaf25ea46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kohout?= Date: Wed, 12 Feb 2025 23:23:30 +0100 Subject: [PATCH 1/5] Function fgetcsv(), argument escape provided explicitly As of PHP 8.4.0, depending on the default value of escape is deprecated. It needs to be provided explicitly either positionally or by the use of named arguments. --- src/InfluxDB2/FluxCsvParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/InfluxDB2/FluxCsvParser.php b/src/InfluxDB2/FluxCsvParser.php index aa4635d0..00ba989b 100644 --- a/src/InfluxDB2/FluxCsvParser.php +++ b/src/InfluxDB2/FluxCsvParser.php @@ -76,7 +76,7 @@ public function parse() public function each() { try { - while (($csv = fgetcsv($this->resource)) !== false) { + while (($csv = fgetcsv($this->resource, escape: '')) !== false) { if (!isset($csv) || (count($csv) == 1 && $csv[0] == null)) { continue; } From 27892e0b21d1b9d5bebaa4cbec32aec88a53c56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kohout?= Date: Wed, 12 Feb 2025 23:37:37 +0100 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4667f568..3f8b0226 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## 3.7.0 [unreleased] +[#162](https://github.com/influxdata/influxdb-client-php/issues/162): PHP 8.4 - fgetcsv() needs provide explicitly argument escape + ## 3.6.0 [2024-06-24] ### Bug Fixes From f6647e9335ffbb0b4fbf062ad9a5e5f6968023db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kohout?= Date: Wed, 12 Feb 2025 23:54:08 +0100 Subject: [PATCH 3/5] Backward compatibility with PHP 7.* --- src/InfluxDB2/FluxCsvParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/InfluxDB2/FluxCsvParser.php b/src/InfluxDB2/FluxCsvParser.php index 00ba989b..a66b4eb6 100644 --- a/src/InfluxDB2/FluxCsvParser.php +++ b/src/InfluxDB2/FluxCsvParser.php @@ -76,7 +76,7 @@ public function parse() public function each() { try { - while (($csv = fgetcsv($this->resource, escape: '')) !== false) { + while (($csv = fgetcsv($this->resource, null, ',', '"', '')) !== false) { if (!isset($csv) || (count($csv) == 1 && $csv[0] == null)) { continue; } From 573a44f164ec8b72d49f62c7bb225ea342a285a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kohout?= Date: Wed, 12 Feb 2025 23:59:30 +0100 Subject: [PATCH 4/5] Fix empty character bug --- src/InfluxDB2/FluxCsvParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/InfluxDB2/FluxCsvParser.php b/src/InfluxDB2/FluxCsvParser.php index a66b4eb6..30da573e 100644 --- a/src/InfluxDB2/FluxCsvParser.php +++ b/src/InfluxDB2/FluxCsvParser.php @@ -76,7 +76,7 @@ public function parse() public function each() { try { - while (($csv = fgetcsv($this->resource, null, ',', '"', '')) !== false) { + while (($csv = fgetcsv($this->resource, null, ',', '"', '\\')) !== false) { if (!isset($csv) || (count($csv) == 1 && $csv[0] == null)) { continue; } From 379b75537b9668f7e35a08e61e19c61d4e559b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= Date: Thu, 13 Feb 2025 14:22:03 +0100 Subject: [PATCH 5/5] docs: Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f8b0226..16d9ca8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 3.7.0 [unreleased] -[#162](https://github.com/influxdata/influxdb-client-php/issues/162): PHP 8.4 - fgetcsv() needs provide explicitly argument escape +### Bug Fixes +1. [#162](https://github.com/influxdata/influxdb-client-php/issues/162): PHP 8.4 - fgetcsv() needs provide explicitly argument escape ## 3.6.0 [2024-06-24]