[BUGFIX] Remove doctype after node elements have been analyzed

Related: darylldoyle#52
lolli42 · Jul 15, 2021 · 1dd4467 · 1dd4467
1 parent feff971
commit 1dd4467
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Sanitizer.php b/src/Sanitizer.php
@@ -208,8 +208,6 @@ public function sanitize($dirty)
             return false;
         }
 
-        $this->removeDoctype();
-
         // Pre-process all identified elements
         $xPath = new XPath($this->xmlDocument);
         $this->elementReferenceResolver = new Resolver($xPath, $this->useNestingLimit);
@@ -219,6 +217,8 @@ public function sanitize($dirty)
         // Grab all the elements
         $allElements = $this->xmlDocument->getElementsByTagName("*");
 
+        // remove doctype after node elements have been analyzed
+        $this->removeDoctype();
         // Start the cleaning proccess
         $this->startClean($allElements, $elementsToRemove);
 

diff --git a/tests/SanitizerTest.php b/tests/SanitizerTest.php
@@ -264,9 +264,10 @@ public function doctypeAndEntityAreRemoved()
         $expected = file_get_contents($dataDirectory . '/entityClean.svg');
 
         $this->class->minify(false);
+        $this->class->removeRemoteReferences(true);
         $cleanData = $this->class->sanitize($initialData);
 
-        $this->assertXmlStringEqualsXmlString($expected, $cleanData);
+        self::assertSame($expected, $cleanData);
     }
 
     /**