From d8f5eab4a1b703e033794c83bf39fdfccc34d9da Mon Sep 17 00:00:00 2001 From: W0rma Date: Tue, 3 Dec 2024 14:52:23 +0100 Subject: [PATCH 1/2] Remove native type hint Implicit nullable parameter types are deprecated in PHP 8.4. This could be fixed by using "?", but this requires at least PHP 7.1 whereas this package still supports PHP 5.6. --- src/Html2Pdf.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Html2Pdf.php b/src/Html2Pdf.php index fb3c4b3f..7b08dbc4 100755 --- a/src/Html2Pdf.php +++ b/src/Html2Pdf.php @@ -381,11 +381,11 @@ protected function getTagObject($tagName) /** * set the debug mode to On * - * @param DebugInterface $debugObject + * @param DebugInterface|null $debugObject * * @return Html2Pdf $this */ - public function setModeDebug(DebugInterface $debugObject = null) + public function setModeDebug($debugObject = null) { if (is_null($debugObject)) { $this->debug = new Debug(); From de4a1106830dbed517bf47188f44148398cc03c4 Mon Sep 17 00:00:00 2001 From: W0rma Date: Tue, 3 Dec 2024 14:56:55 +0100 Subject: [PATCH 2/2] Set escape parameter of fgetcsv() explicitly As of PHP 8.4.0, depending on the default value of escape is deprecated. --- src/Locale.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Locale.php b/src/Locale.php index ffa9a76c..226ae238 100644 --- a/src/Locale.php +++ b/src/Locale.php @@ -81,7 +81,12 @@ public static function load($code) self::$list = array(); $handle = fopen($file, 'r'); while (!feof($handle)) { - $line = fgetcsv($handle); + if (PHP_VERSION >= 80400) { + // As of PHP 8.4.0, depending on the default value of escape is deprecated. + $line = fgetcsv($handle, null, ',', '"', '\\'); + } else { + $line = fgetcsv($handle); + } if (!is_array($line) || count($line) !=2) { continue; }