]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a552ac5)
ext/tidy: fix DOCTYPE definitions in expected test output.
authorMichael Orlitzky <michael@orlitzky.com>
Fri, 10 Jun 2016 03:09:33 +0000 (23:09 -0400)
committerAnatol Belski <ab@php.net>
Mon, 11 Jul 2016 12:05:43 +0000 (14:05 +0200)
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").

ext/tidy/tests/003.phpt patch | blob | history
ext/tidy/tests/017.phpt patch | blob | history
ext/tidy/tests/020.phpt patch | blob | history
ext/tidy/tests/026.phpt patch | blob | history

diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt
index 7201d6a5a22a257b37495d8bec81ee359feb3199..1a63d44dfdd4000825d23d7c5ccbdd44c63ba4d8 100644 (file)
--- 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
index ba620a32ec32945d1dd80e61db392feb185b9d76..24597e1a4ad2e9c85f67e6e5bb7ed2a10d0e7481 100644 (file)
--- 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
index dbfda96375bcb42eb86486ccb2c0dfe3120e2236..8ff1efbb689639934211d98cdea7b53b801602de 100644 (file)
--- 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
index 24a1e6f4a7c117620faf9cee2d367a1ecd52a7af..b46cd5464b9b784aaa98dd2fea7ddfaab97337b2 100644 (file)
--- 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>
Unnamed repository; edit this file 'description' to name the repository.