[BUGFIX] Correctly import nodes with different owner document

TYPO3 · Oct 20, 2023 · bd5c573 · bd5c573
1 parent c1a88e7
commit bd5c573
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/Sanitizer.php b/src/Sanitizer.php
@@ -201,8 +201,11 @@ protected function replaceNode(DOMNode $source, $target)
         if ($target === null) {
             $source->parentNode->removeChild($source);
         } elseif ($source !== $target) {
-            if ($source->ownerDocument !== $target->ownerDocument) {
-                $source->ownerDocument->importNode($target);
+            if ($source->ownerDocument !== $target->ownerDocument
+                && $source->ownerDocument !== null
+                && $target->ownerDocument !== null
+            ) {
+                $target = $source->ownerDocument->importNode($target, true);
             }
             $source->parentNode->replaceChild($target, $source);
         }

diff --git a/tests/ScenarioTest.php b/tests/ScenarioTest.php
@@ -226,6 +226,42 @@ public function tagIsHandled(Behavior\NodeHandler $nodeHandler, string $payload,
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
+    /**
+     * @test
+     */
+    public function tagHandlingIsDelegated(): void
+    {
+        $behavior = (new Behavior())
+            ->withFlags(Behavior::REMOVE_UNEXPECTED_CHILDREN)
+            ->withName('scenario-test')
+            ->withTags(new Behavior\Tag('div', Behavior\Tag::ALLOW_CHILDREN))
+            ->withNodes(
+                new Behavior\NodeHandler(
+                    new Behavior\Tag('my-placeholder'),
+                    new Behavior\Handler\ClosureHandler(
+                        static function (NodeInterface $node, ?DOMNode $domNode): ?\DOMNode {
+                            if ($domNode === null) {
+                                return null;
+                            }
+                            $newDocument = new \DOMDocument();
+                            $text = $newDocument->createTextNode($domNode->textContent);
+                            $span = $newDocument->createElement('div');
+                            $span->setAttribute('class', 'delegated');
+                            $span->appendChild($text);
+                            return $span;
+                        }
+                    )
+                )
+            );
+        $sanitizer = new Sanitizer(
+            $behavior,
+            new CommonVisitor($behavior)
+        );
+        $payload = '<div><my-placeholder><span class="inner">value</span></my-placeholder></div>';
+        $expectation = '<div><div class="delegated">value</div></div>';
+        self::assertSame($expectation, $sanitizer->sanitize($payload));
+    }
+
     public static function commentsAreHandledDataProvider(): array
     {
         return [