Merge pull request #2292 from neopheus/php8.1-fix-2290

Php 8.1 fix #2290
PHPOffice · Sep 15, 2022 · 93e16d4 · 93e16d4
2 parents f853b9f + fa84160
commit 93e16d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/PhpWord/Escaper/Xml.php b/src/PhpWord/Escaper/Xml.php
@@ -27,6 +27,6 @@ class Xml extends AbstractEscaper
     protected function escapeSingleValue($input)
     {
         // todo: omit encoding parameter after migration onto PHP 5.4
-        return htmlspecialchars($input, ENT_QUOTES, 'UTF-8');
+        return (!is_null($input)) ? htmlspecialchars($input, ENT_QUOTES, 'UTF-8') : '';
     }
 }
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
@@ -257,11 +257,11 @@ protected static function ensureMacroCompleted($macro)
      */
     protected static function ensureUtf8Encoded($subject)
     {
-        if (!Text::isUTF8($subject)) {
+        if (!Text::isUTF8($subject) && !is_null($subject)) {
             $subject = utf8_encode($subject);
         }
 
-        return $subject;
+        return (!is_null($subject)) ? $subject : '';
     }
 
     /**