Php8.5 Accommodations

Dompdf (temporary till 8.5-compatible release available), `chr` in Reader/MsDoc, `setAccessible` in AbstractStyleTest.

Author: oleibman

src/PhpWord/Reader/MsDoc.php

@@ -1218,7 +1218,7 @@ private function readRecordSttbfFfn(): void
                     $char = self::getInt2d($this->data1Table, $posMem);
                     $posMem += 2;
                     if ($char > 0) {
-                        $xszFfn .= chr($char);
+                        $xszFfn .= mb_chr($char, 'UTF-8');
                     }
                 } while ($char != 0);
                 // xszAlt
@@ -1230,7 +1230,7 @@ private function readRecordSttbfFfn(): void
                         if ($char == 0) {
                             break;
                         }
-                        $xszAlt .= chr($char);
+                        $xszAlt .= mb_chr($char, 'UTF-8');
                     } while ($char != 0);
                 }
                 $this->arrayFonts[] = [

src/PhpWord/Writer/PDF/DomPDF.php

@@ -64,6 +64,14 @@ public function save(string $filename): void
         $orientation = 'portrait';
 
         //  Create PDF
+        $restoreHandler = false;
+        if (PHP_VERSION_ID >= self::$temporaryVersionCheck) {
+            // @codeCoverageIgnoreStart
+            $errhandler = [$this, 'specialErrorHandler'];
+            set_error_handler($errhandler); // @phpstan-ignore-line
+            $restoreHandler = true;
+            // @codeCoverageIgnoreEnd
+        }
         $pdf = $this->createExternalWriterInstance();
         $pdf->setPaper(strtolower($paperSize), $orientation);
         $pdf->loadHtml(str_replace(PHP_EOL, '', $this->getContent()));
@@ -72,6 +80,27 @@ public function save(string $filename): void
         //  Write to file
         fwrite($fileHandle, $pdf->output());
 
+        if ($restoreHandler) {
+            restore_error_handler(); // @codecoverageignore
+        }
         parent::restoreStateAfterSave($fileHandle);
     }
+
+    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/', $errstr) === 1) {
+                return true;
+            }
+        }
+
+        return false; // continue error handling
+    }
 }

tests/PhpWordTests/Style/AbstractStyleTest.php

@@ -124,6 +124,8 @@ public function testSetValEnumException(): void
         self::assertEquals('b', self::callProtectedMethod($stub, 'setEnumVal', ['z', ['a', 'b'], 'b']));
     }
 
+    protected static int $temporaryVersionCheck = 80500;
+
     /**
      * Helper function to call protected method.
      *
@@ -134,7 +136,9 @@ public static function callProtectedMethod($object, $method, array $args = [])
     {
         $class = new ReflectionClass(get_class($object));
         $method = $class->getMethod($method);
-        $method->setAccessible(true);
+        if (PHP_VERSION_ID < self::$temporaryVersionCheck) {
+            $method->setAccessible(true);
+        }
 
         return $method->invokeArgs($object, $args);
     }