Merge pull request #4 from artemeon/fix/convert-confluence-tags-before-html-validation

sidler · web-flow · commit 7e29c3925fbb · 2025-02-14T16:20:03.000+01:00
fix html validation
diff --git a/src/ConfluencePageContentDownloader.php b/src/ConfluencePageContentDownloader.php
@@ -26,15 +26,15 @@ public function __construct(Content $contentEndpoint, Download $downloadEndpoint
 
     public function downloadPageContent(ConfluencePage $page, bool $withAttachments = true): void
     {
-        $page = $this->repairPageContent($page);
-
         try {
             foreach ($this->macroReplacers as $macroReplacer) {
                 if ($macroReplacer instanceof MacroReplacerInterface) {
                     $page->setContent($macroReplacer->replace($page->getContent()));
                 }
             }
 
+            $page = $this->repairPageContent($page);
+
             $this->downloadEndpoint->downloadPageContent($page, 'content.html');
 
             if (!$withAttachments) {

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ public function __construct(Content $contentEndpoint, Download $downloadEndpoint`
`26`	`26`
`27`	`27`	`public function downloadPageContent(ConfluencePage $page, bool $withAttachments = true): void`
`28`	`28`	`{`
`29`		`- $page = $this->repairPageContent($page);`
`30`		`-`
`31`	`29`	`try {`
`32`	`30`	`foreach ($this->macroReplacers as $macroReplacer) {`
`33`	`31`	`if ($macroReplacer instanceof MacroReplacerInterface) {`
`34`	`32`	`$page->setContent($macroReplacer->replace($page->getContent()));`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`
	`36`	`+ $page = $this->repairPageContent($page);`
	`37`	`+`
`38`	`38`	`$this->downloadEndpoint->downloadPageContent($page, 'content.html');`
`39`	`39`
`40`	`40`	`if (!$withAttachments) {`