Merge pull request #815 from W0rma/php84

Fix PHP 8.4 deprecation warnings
spipu · Dec 3, 2024 · 5b145f2 · 5b145f2
2 parents befc812 + de4a110
commit 5b145f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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();

diff --git 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;
             }