Merge pull request #4649 from oleibman/mpdford

Temporary Workaround for Mpdf Php8.5 Deprecation

Author: oleibman

composer.json

@@ -92,12 +92,12 @@
         "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
         "dompdf/dompdf": "^2.0 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.2",
-        "mitoteam/jpgraph": "^10.3",
+        "mitoteam/jpgraph": "^10.3 || 10.5.0-beta",
         "mpdf/mpdf": "^8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1 || ^2.0",
-        "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
         "phpstan/phpstan-deprecation-rules": "^1.0 || ^2.0",
+        "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
         "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.7",
         "tecnickcom/tcpdf": "^6.5"

composer.lock

@@ -40,6 +40,13 @@ public function save($filename, int $flags = 0): void
 
         //  Create PDF
         $config = ['tempDir' => $this->tempDir . '/mpdf'];
+        $restoreHandler = false;
+        if (PHP_VERSION_ID >= self::$temporaryVersionCheck) {
+            // @codeCoverageIgnoreStart
+            set_error_handler(self::specialErrorHandler(...));
+            $restoreHandler = true;
+            // @codeCoverageIgnoreEnd
+        }
         $pdf = $this->createExternalWriterInstance($config);
         $ortmp = $orientation;
         $pdf->_setPageSize($paperSize, $ortmp);
@@ -83,9 +90,30 @@ public function save($filename, int $flags = 0): void
         $str = $pdf->Output('', 'S');
         fwrite($fileHandle, $str);
 
+        if ($restoreHandler) {
+            restore_error_handler(); // @codeCoverageIgnore
+        }
         parent::restoreStateAfterSave();
     }
 
+    protected static int $temporaryVersionCheck = 80500;
+
+    /**
+     * Temporary handler for Php8.5 waiting for Dompdf release.
+     *
+     * @codeCoverageIgnore
+     */
+    public function specialErrorHandler(int $errno, string $errstr, string $filename, int $lineno): bool
+    {
+        if ($errno === E_DEPRECATED) {
+            if (preg_match('/Providing an empty string is deprecated/', $errstr) === 1) {
+                return true;
+            }
+        }
+
+        return false; // continue error handling
+    }
+
     /**
      * Convert inches to mm.
      */

src/PhpSpreadsheet/Writer/Pdf/Mpdf.php

@@ -6,9 +6,6 @@
 
 function phpunit10ErrorHandler(int $errno, string $errstr, string $filename, int $lineno): bool
 {
-    if (strIncrement85(PHP_VERSION_ID, $errno, $errstr, $filename)) {
-        return true; // message suppressed - stop error handling
-    }
     $x = error_reporting() & $errno;
     if (
         in_array(
@@ -34,18 +31,6 @@ function phpunit10ErrorHandler(int $errno, string $errstr, string $filename, int
     return false; // continue error handling
 }
 
-function strIncrement85(int $version, int $errno, string $errstr, string $filename): bool
-{
-    if ($version < 80500 || $errno !== E_DEPRECATED) {
-        return false;
-    }
-    if (preg_match('/canonical/', $errstr) === 1 && preg_match('/mitoteam/', $filename) === 1) {
-        return true;
-    }
-
-    return false;
-}
-
 if (!method_exists(PHPUnit\Framework\TestCase::class, 'setOutputCallback')) {
     set_error_handler('phpunit10ErrorHandler');
 }