ext/tidy: fix DOCTYPE definitions in expected test output.

The test suite for the tidy extension was written before HTML5 was "standardized". The new tidy-html5 library will output an HTML5 DOCTYPE in the absence of any other information, so the expected test outputs have been updated to accomodate the absense of an HTML version (which is how you declare "HTML5").
UziTech · Jul 11, 2016 · 0e3e132 · 0e3e132
1 parent a552ac5
commit 0e3e132
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt
@@ -10,8 +10,8 @@ tidy_clean_repair()
 	echo tidy_get_output($a);
 
 ?>
---EXPECT--
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+--EXPECTF--
+<!DOCTYPE html%S>
 <html>
 <head>
 <title></title>

diff --git a/ext/tidy/tests/017.phpt b/ext/tidy/tests/017.phpt
@@ -5,8 +5,8 @@ The Tidy Output Buffer Filter
 --FILE--
 <?php ob_start("ob_tidyhandler"); ?>
 <B>testing</I>
---EXPECT--
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+--EXPECTF--
+<!DOCTYPE html%S>
 <html>
 <head>
 <title></title>

diff --git a/ext/tidy/tests/020.phpt b/ext/tidy/tests/020.phpt
@@ -19,12 +19,11 @@ var_dump(strlen($tidy->errorBuffer) > 50);
 
 echo $tidy;
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html%A>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title></title>

diff --git a/ext/tidy/tests/026.phpt b/ext/tidy/tests/026.phpt
@@ -12,8 +12,8 @@ echo '<p>xpto</p>';
 
 ?>
 </html>
---EXPECT--
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+--EXPECTF--
+<!DOCTYPE html%S>
 <html>
 <head>
 <title></title>