PHP 7.3 keeps some more whitespaces in DOMDocument

ThomasWeinert · Nov 11, 2018 · 9103871 · 9103871
1 parent 8a2b862
commit 9103871
Showing 1 changed file with 51 additions and 21 deletions.
diff --git a/tests/FluentDOM/Loader/HtmlTest.php b/tests/FluentDOM/Loader/HtmlTest.php
@@ -296,13 +296,24 @@ public function testLoadWithMultiByteHtmlDefinedByMetaTag() {
           Options::ENCODING => 'ascii'
         ]
       );
-      $this->assertEquals(
-        '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
-        '<html>'."\n".
-        '<head><meta charset="utf-8"></head>'."\n".
-        '<body>你好，世界</body>'."\n".
-        '</html>'."\n",
-        $result->getDocument()->saveHTML()
+      $this->assertThat(
+        $result->getDocument()->saveHTML(),
+        $this->logicalOr(
+          $this->equalTo(
+            '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
+            '<html>'."\n".
+            '<head><meta charset="utf-8"></head>'."\n".
+            '<body>你好，世界</body>'."\n".
+            '</html>'."\n"
+          ),
+          $this->equalTo(
+            '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
+            '<html>'.
+            '<head><meta charset="utf-8"></head>'.
+            '<body>你好，世界</body>'.
+            '</html>'."\n"
+          )
+        )
       );
     }
 
@@ -323,13 +334,24 @@ public function testLoadWithMultiByteHtmlDefinedByDeprecatedMetaTag() {
           Options::ENCODING => 'ascii'
         ]
       );
-      $this->assertEquals(
-        '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
-        '<html>'."\n".
-        '<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>'."\n".
-        '<body>你好，世界</body>'."\n".
-        '</html>'."\n",
-        $result->getDocument()->saveHTML()
+      $this->assertThat(
+        $result->getDocument()->saveHTML(),
+        $this->logicalOr(
+          $this->equalTo(
+            '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
+            '<html>'."\n".
+            '<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>'."\n".
+            '<body>你好，世界</body>'."\n".
+            '</html>'."\n"
+          ),
+          $this->equalTo(
+            '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
+            '<html>'.
+            '<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>'.
+            '<body>你好，世界</body>'.
+            '</html>'."\n"
+          )
+        )
       );
     }
 
@@ -373,13 +395,21 @@ public function testLoadWithMultiByteHtmlReplaceExistingPi() {
           Options::FORCE_ENCODING => true
         ]
       );
-      $this->assertEquals(
-        '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
-        '<html>'."\n".
-        '<head><meta charset="utf-8"></head>'."\n".
-        '<body>你好，世界</body>'."\n".
-        '</html>'."\n",
-        $result->getDocument()->saveHTML()
+      $this->assertThat(
+        $result->getDocument()->saveHTML(),
+        $this->logicalOr(
+          $this->equalTo(
+            '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
+            '<html>'."\n".
+            '<head><meta charset="utf-8"></head>'."\n".
+            '<body>你好，世界</body>'."\n".
+            '</html>'."\n"
+          ),
+          $this->equalTo(
+            '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">'."\n".
+            '<html><head><meta charset="utf-8"></head><body>你好，世界</body></html>'."\n"
+          )
+        )
       );
     }
   }