Merge pull request #4659 from oleibman/dompdf311

Update to Php8.5-compatible Dompdf

Author: oleibman

composer.lock

@@ -44,43 +44,15 @@ public function save($filename, int $flags = 0): void
         $orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
 
         //  Create PDF
-        $restoreHandler = false;
-        if (PHP_VERSION_ID >= self::$temporaryVersionCheck) {
-            // @codeCoverageIgnoreStart
-            set_error_handler(self::specialErrorHandler(...));
-            $restoreHandler = true;
-            // @codeCoverageIgnoreEnd
-        }
         $pdf = $this->createExternalWriterInstance();
         $pdf->setPaper($paperSize, $orientation);
 
         $pdf->loadHtml($this->generateHTMLAll());
         $pdf->render();
 
         //  Write to file
-        fwrite($fileHandle, $pdf->output() ?? '');
+        fwrite($fileHandle, $pdf->output());
 
-        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('/canonical|imagedestroy|http_get_last_response_headers|Using null as an array offset/', $errstr) === 1) {
-                return true;
-            }
-        }
-
-        return false; // continue error handling
-    }
 }