From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 10 Jun 2016 03:14:19 +0000 (-0400)
Subject: ext/tidy: fix expected test output with tidy-html5.
X-Git-Tag: php-7.1.0beta1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=846c72a3b8f2319170fd313abb8be8eb16e0e3d7;p=php

ext/tidy: fix expected test output with tidy-html5.

One of the tidy tests expects some output that has (harmlessly)
changed in tidy-html5. The "EXPECT" block for that test was changed to
"EXPECTF" and mangled to accept both the old and new outputs.
---

diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt
index d13c37dcd8..9d3cd2ef5a 100644
--- a/ext/tidy/tests/004.phpt
+++ b/ext/tidy/tests/004.phpt
@@ -19,13 +19,13 @@ $a = tidy_parse_string($html);
 var_dump(tidy_diagnose($a));
 echo tidy_get_error_buffer($a);
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 line 1 column 1 - Warning: missing <!DOCTYPE> declaration
 line 1 column 7 - Warning: discarding unexpected </html>
 line 1 column 14 - Warning: inserting missing 'title' element
-Info: Document content looks like HTML 3.2
-3 warnings, 0 errors were found!
+Info: Document content looks like HTML%w%d%S
+%S3 warnings%S0 errors%S
 bool(true)
 Info: Document content looks like HTML 3.2
 No warnings or errors were found.