From f860fabf2d15bb5f0c8436197e899f318c292721 Mon Sep 17 00:00:00 2001
From: Marc Reichel <marc.reichel@artemeon.de>
Date: Thu, 24 Sep 2026 22:29:32 +0200
Subject: [PATCH] #35420 fix(confluence): Keep link text when removing
 Confluence links

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 src/MacroReplacer/LinkMacroReplacer.php       | 39 +++++++++++
 tests/MacroReplacer/LinkMacroReplacerTest.php | 65 +++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 src/MacroReplacer/LinkMacroReplacer.php
 create mode 100644 tests/MacroReplacer/LinkMacroReplacerTest.php

diff --git a/src/MacroReplacer/LinkMacroReplacer.php b/src/MacroReplacer/LinkMacroReplacer.php
new file mode 100644
index 0000000..bfefe28
--- /dev/null
+++ b/src/MacroReplacer/LinkMacroReplacer.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Artemeon\Confluence\MacroReplacer;
+
+/**
+ * Replace <ac:link> with its link text, dropping the link itself.
+ *
+ * Must run before {@see OtherMacroRemover}, which would otherwise remove the link together with its text.
+ */
+class LinkMacroReplacer implements MacroReplacerInterface
+{
+    public function replace(string $haystack): string
+    {
+        return preg_replace_callback(
+            '/<ac:link\b[^>]*>(.*?)<\/ac:link>/is',
+            function ($match) {
+                $linkContent = $match[1];
+
+                if (preg_match('/<ac:link-body[^>]*>(.*?)<\/ac:link-body>/is', $linkContent, $body)) {
+                    return $body[1];
+                }
+
+                if (preg_match('/<ac:plain-text-link-body[^>]*>\s*<!\[CDATA\[(.*?)]]>\s*<\/ac:plain-text-link-body>/is', $linkContent, $body)) {
+                    return htmlspecialchars($body[1], ENT_QUOTES | ENT_HTML5);
+                }
+
+                // Without a link body, Confluence displays the title of the linked page or attachment.
+                if (preg_match('/ri:(?:content-title|filename)="([^"]*)"/i', $linkContent, $title)) {
+                    return $title[1];
+                }
+
+                return '';
+            },
+            $haystack
+        ) ?? $haystack;
+    }
+}
diff --git a/tests/MacroReplacer/LinkMacroReplacerTest.php b/tests/MacroReplacer/LinkMacroReplacerTest.php
new file mode 100644
index 0000000..62b324b
--- /dev/null
+++ b/tests/MacroReplacer/LinkMacroReplacerTest.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Artemeon\Confluence\Tests\MacroReplacer;
+
+use Artemeon\Confluence\MacroReplacer\LinkMacroReplacer;
+use Artemeon\Confluence\MacroReplacer\OtherMacroRemover;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Regression test for #35420: links to other Confluence pages must keep their text,
+ * instead of being removed entirely by {@see OtherMacroRemover}.
+ */
+final class LinkMacroReplacerTest extends TestCase
+{
+    /**
+     * @return array<string, array{string, string}>
+     */
+    public static function links(): array
+    {
+        return [
+            'plain text link body' => [
+                '<p>See <ac:link><ri:page ri:content-title="Contracts" /><ac:plain-text-link-body><![CDATA[contracts & more]]></ac:plain-text-link-body></ac:link> here</p>',
+                '<p>See contracts &amp; more here</p>',
+            ],
+            'rich text link body' => [
+                '<p>See <ac:link ac:anchor="top"><ri:page ri:content-title="Contracts" /><ac:link-body><strong>Contracts</strong></ac:link-body></ac:link> here</p>',
+                '<p>See <strong>Contracts</strong> here</p>',
+            ],
+            'page link without body' => [
+                '<p>See <ac:link><ri:page ri:content-title="Contracts" /></ac:link> here</p>',
+                '<p>See Contracts here</p>',
+            ],
+            'attachment link without body' => [
+                '<p>See <ac:link><ri:attachment ri:filename="manual.pdf" /></ac:link> here</p>',
+                '<p>See manual.pdf here</p>',
+            ],
+            'user link without body' => [
+                '<p>Ask <ac:link><ri:user ri:account-id="123" /></ac:link> here</p>',
+                '<p>Ask  here</p>',
+            ],
+            'multiple links' => [
+                '<ac:link><ri:page ri:content-title="A" /></ac:link>, <ac:link><ri:page ri:content-title="B" /></ac:link>',
+                'A, B',
+            ],
+        ];
+    }
+
+    #[DataProvider('links')]
+    public function testReplacesLinkWithItsText(string $input, string $expected): void
+    {
+        $this->assertSame($expected, (new LinkMacroReplacer())->replace($input));
+    }
+
+    public function testLinkTextSurvivesOtherMacroRemover(): void
+    {
+        $input = '<p>See <ac:link><ri:page ri:content-title="Contracts" /><ac:plain-text-link-body><![CDATA[Contracts]]></ac:plain-text-link-body></ac:link> here</p>';
+
+        $output = (new OtherMacroRemover())->replace((new LinkMacroReplacer())->replace($input));
+
+        $this->assertSame('<p>See Contracts here</p>', $output);
+    }
+}