Make the normalizer reusable by passing in the `\DOMXPath` for `normalize()`

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeNormalizer.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeNormalizer.class.php
index 4bf2fdafab9790d34fc98be24b74c0d95f682eb1..85dc4295557cd1a850ff777beab7d0e46d8799f4 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeNormalizer.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeNormalizer.class.php
@@ -14,26 +14,22 @@ use wcf\util\DOMUtil;
  */
 final class HtmlOutputNodeNormalizer
 {
-    public function __construct(private readonly \DOMXPath $xpath)
+    public function normalize(\DOMXPath $xpath): void
     {
-    }
-
-    public function normalize(): void
-    {
-        $this->normalizeBr();
+        $this->normalizeBr($xpath);
 
-        $candidates = $this->getPossibleSpacerParagraphs();
+        $candidates = $this->getPossibleSpacerParagraphs($xpath);
         $this->reduceSpacerParagraphs($candidates);
     }
 
     /**
      * @return list<\DOMElement>
      */
-    private function getPossibleSpacerParagraphs(): array
+    private function getPossibleSpacerParagraphs(\DOMXpath $xpath): array
     {
         $paragraphs = [];
 
-        foreach ($this->xpath->query('//p') as $p) {
+        foreach ($xpath->query('//p') as $p) {
             \assert($p instanceof \DOMElement);
 
             if ($p->childNodes->length === 1) {
@@ -96,9 +92,9 @@ final class HtmlOutputNodeNormalizer
         }
     }
 
-    private function normalizeBr(): void
+    private function normalizeBr(\DOMXpath $xpath): void
     {
-        foreach ($this->xpath->query('//br') as $br) {
+        foreach ($xpath->query('//br') as $br) {
             \assert($br instanceof \DOMElement);
 
             $this->unwrapBr($br);

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
index bf2b41a81e2f373011ac7cdee3548eeca3cf311e..2a6a109505cd1241a6034ca87428f126ff80e7ee 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
@@ -97,7 +97,7 @@ class HtmlOutputNodeProcessor extends AbstractHtmlNodeProcessor
             $this->invokeHtmlNode(new HtmlOutputUnfurlUrlNode());
         }
 
-        (new HtmlOutputNodeNormalizer($this->getXPath()))->normalize();
+        (new HtmlOutputNodeNormalizer())->normalize($this->getXPath());
 
         // dynamic node handlers
         $this->invokeNodeHandlers('wcf\system\html\output\node\HtmlOutputNode', ['woltlab-metacode']);