com php-src: ext/tidy: fix DOCTYPE definitions in expected test output.: ext/tidy/tests/003.phpt ext/tidy/tests/017.phpt ext/tidy/tests/020.phpt
ext/tidy/tests/026.phpt
| From: | Anatol Belski | Date: | Mon, 11 Jul 2016 12:05:43 +0000 |
| Subject: | com php-src: ext/tidy: fix DOCTYPE definitions in expected test output.: ext/tidy/tests/003.phpt ext/tidy/tests/017.phpt ext/tidy/tests/020.phpt ext/tidy/tests/026.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92927@lists.php.net to get a copy of this message | ||
Commit: 0e3e132a8affa976ef86cce051ba94f8bb43e147
Author: Michael Orlitzky <michael@orlitzky.com> Thu, 9 Jun 2016 23:09:33 -0400
Committer: Anatol Belski <ab@php.net> Mon, 11 Jul 2016 14:05:43 +0200
Parents: a552ac5bd589035b66c899b74511b29a3d1a4718
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0e3e132a8affa976ef86cce051ba94f8bb43e147
Log:
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").
Changed paths:
M ext/tidy/tests/003.phpt
M ext/tidy/tests/017.phpt
M ext/tidy/tests/020.phpt
M ext/tidy/tests/026.phpt
Diff:
diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt
index 7201d6a..1a63d44 100644
--- 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 ba620a3..24597e1 100644
--- 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 dbfda96..8ff1efb 100644
--- 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 24a1e6f..b46cd54 100644
--- 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>