#349 add workaround for CDATA

dauxio · Dec 14, 2022 · 419515e · 419515e
1 parent f0367c5
commit 419515e
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/libs/Format/Confluence/DetailsToExpand.php b/libs/Format/Confluence/DetailsToExpand.php
@@ -6,6 +6,8 @@ public function convert(string $content): string
     {
         // convert <namespace:tag to <namespace__tag for DOMDocument to be happy
         $content = preg_replace('/<(\/?)(\w+):(\w+)/', '<\1\2___\3', $content);
+        $content = str_replace('<![CDATA[', '__CDATA_START__', $content);
+        $content = str_replace(']]>', '__CDATA_END__', $content);
 
         $dom = new \DOMDocument();
 
@@ -29,6 +31,9 @@ public function convert(string $content): string
         }
 
         // restore namespace tags
+        $finalContent = str_replace('__CDATA_START__', '<![CDATA[', $finalContent);
+        $finalContent = str_replace('__CDATA_END__', ']]>', $finalContent);
+
         return preg_replace('/<(\/?)(\w+)___(\w+)/', '<\1\2:\3', $finalContent);
     }
 

diff --git a/tests/Format/Confluence/DetailsToExpandTest.php b/tests/Format/Confluence/DetailsToExpandTest.php
@@ -60,6 +60,44 @@ public function provideExpandData()
                     </ac:rich-text-body></ac:structured-macro>
                     EOD
             ],
+            [
+                // Works with confluence code blocks
+                <<<'EOD'
+                    <ac:structured-macro ac:name="html">
+                    <ac:plain-text-body> <![CDATA[
+                    <script>
+                    console.log("hi friends");
+                    </script>
+                    ]]></ac:plain-text-body>
+                    </ac:structured-macro>
+
+                    <details>
+                    <summary>Title !</summary>
+
+                    <ul>
+                        <li>Item 1</li>
+                        <li>Item 2</li>
+                    </ul>
+
+                    </details>
+                    EOD,
+                <<<'EOD'
+                    <ac:structured-macro ac:name="html">
+                    <ac:plain-text-body> <![CDATA[
+                    <script>
+                    console.log("hi friends");
+                    </script>
+                    ]]></ac:plain-text-body>
+                    </ac:structured-macro>
+                    <ac:structured-macro ac:name="expand"><ac:parameter ac:name="">Title !</ac:parameter><ac:rich-text-body>
+
+                    <ul>
+                        <li>Item 1</li>
+                        <li>Item 2</li>
+                    </ul>
+                    </ac:rich-text-body></ac:structured-macro>
+                    EOD
+            ],
             [
                 // Don't convert without title
                 <<<'EOD'