Searching: Added test for guillemets

[bookstack] / app / Entities / Tools / PageIncludeParser.php

diff --git a/app/Entities/Tools/PageIncludeParser.php b/app/Entities/Tools/PageIncludeParser.php
index 02af3fce99aef19a751497620fef76e78522469e..e0b89f158704298702122f9839898be6c9e6ffde 100644 (file)
--- a/app/Entities/Tools/PageIncludeParser.php
+++ b/app/Entities/Tools/PageIncludeParser.php
@@ -19,6 +19,9 @@ class PageIncludeParser
      */
     protected array $toCleanup = [];
 
      */
     protected array $toCleanup = [];
 

+    /**
+     * @param Closure(PageIncludeTag $tag): PageContent $pageContentForId
+     */

     public function __construct(
         protected HtmlDocument $doc,
         protected Closure $pageContentForId,
     public function __construct(
         protected HtmlDocument $doc,
         protected Closure $pageContentForId,


@@ -35,8 +38,8 @@ class PageIncludeParser
         $tags = $this->locateAndIsolateIncludeTags();
 
         foreach ($tags as $tag) {
         $tags = $this->locateAndIsolateIncludeTags();
 
         foreach ($tags as $tag) {

-            $htmlContent = $this->pageContentForId->call($this, $tag->getPageId());
-            $content = new PageIncludeContent($htmlContent, $tag);
+            /** @var PageIncludeContent $content */
+            $content = $this->pageContentForId->call($this, $tag);

 
             if (!$content->isInline()) {
                 $parentP = $this->getParentParagraph($tag->domNode);
 
             if (!$content->isInline()) {
                 $parentP = $this->getParentParagraph($tag->domNode);


@@ -69,8 +72,8 @@ class PageIncludeParser
         $includeTags = [];
 
         /** @var DOMNode $node */
         $includeTags = [];
 
         /** @var DOMNode $node */

-        /** @var DOMNode $childNode */

         foreach ($includeHosts as $node) {
         foreach ($includeHosts as $node) {

+            /** @var DOMNode $childNode */

             foreach ($node->childNodes as $childNode) {
                 if ($childNode->nodeName === '#text') {
                     array_push($includeTags, ...$this->splitTextNodesAtTags($childNode));
             foreach ($node->childNodes as $childNode) {
                 if ($childNode->nodeName === '#text') {
                     array_push($includeTags, ...$this->splitTextNodesAtTags($childNode));


@@ -101,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);
         }


@@ -171,8 +174,8 @@ class PageIncludeParser
         $parentNode->parentNode->insertBefore($parentClone, $parentNode);
         $parentClone->removeAttribute('id');
 
         $parentNode->parentNode->insertBefore($parentClone, $parentNode);
         $parentClone->removeAttribute('id');
 

-        /** @var DOMNode $child */

         for ($i = 0; $i < $splitPos; $i++) {
         for ($i = 0; $i < $splitPos; $i++) {

+            /** @var DOMNode $child */

             $child = $children[$i];
             $parentClone->appendChild($child);
         }
             $child = $children[$i];
             $parentClone->appendChild($child);
         }