Includes: Workaround for PHP 8.3.14 bug

Changed DOMText creation to be done via document so its document
reference is correct to avoid a bug in PHP 8.3.14.
Ref: https://github.com/php/php-src/issues/16967

Fixes #5341

diff --git a/app/Entities/Tools/PageIncludeParser.php b/app/Entities/Tools/PageIncludeParser.php
index dad7c29e60ee3392de7b6d56726fee5455074eb5..e0b89f158704298702122f9839898be6c9e6ffde 100644 (file)
--- a/app/Entities/Tools/PageIncludeParser.php
+++ b/app/Entities/Tools/PageIncludeParser.php
@@ -104,10 +104,10 @@ class PageIncludeParser
 
             if ($currentOffset < $tagStartOffset) {
                 $previousText = substr($text, $currentOffset, $tagStartOffset - $currentOffset);
 
             if ($currentOffset < $tagStartOffset) {
                 $previousText = substr($text, $currentOffset, $tagStartOffset - $currentOffset);

-                $textNode->parentNode->insertBefore(new DOMText($previousText), $textNode);
+                $textNode->parentNode->insertBefore($this->doc->createTextNode($previousText), $textNode);

             }
 
             }
 

-            $node = $textNode->parentNode->insertBefore(new DOMText($tagOuterContent), $textNode);
+            $node = $textNode->parentNode->insertBefore($this->doc->createTextNode($tagOuterContent), $textNode);

             $includeTags[] = new PageIncludeTag($tagInnerContent, $node);
             $currentOffset = $tagStartOffset + strlen($tagOuterContent);
         }
             $includeTags[] = new PageIncludeTag($tagInnerContent, $node);
             $currentOffset = $tagStartOffset + strlen($tagOuterContent);
         }

diff --git a/app/Util/HtmlDocument.php b/app/Util/HtmlDocument.php
index b8c53d43916294dccf63ed3821222f2888edf22d..7517955b9f60b2e14afbd91fddb7123fc9fb2095 100644 (file)
--- a/app/Util/HtmlDocument.php
+++ b/app/Util/HtmlDocument.php
@@ -6,6 +6,7 @@ use DOMDocument;
 use DOMElement;
 use DOMNode;
 use DOMNodeList;
 use DOMElement;
 use DOMNode;
 use DOMNodeList;

+use DOMText;

 use DOMXPath;
 
 /**
 use DOMXPath;
 
 /**


@@ -81,6 +82,14 @@ class HtmlDocument
         return $element;
     }
 
         return $element;
     }
 

+    /**
+     * Create a new text node within this document.
+     */
+    public function createTextNode(string $text): DOMText
+    {
+        return $this->document->createTextNode($text);
+    }
+

     /**
      * Get an element within the document of the given ID.
      */
     /**
      * Get an element within the document of the given ID.
      */