archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

revert r319254 (fix bug #54682) since it is not correct

Browse source 
add test that was broken with that patch.
this bug is probably in libtidy itself and not in PHP. I didn't investigate it enough to confirm, though
This commit is contained in:
Nuno Lopes 2012-01-21 11:32:56 +00:00
parent 1bad879f4c
commit 023555c7c6
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ext/tidy/tests/004.phpt
View file

@ -4,14 +4,28 @@ tidy_diagnose()
<?php if (!extension_loaded("tidy")) print "skip"; ?> <?php if (!extension_loaded("tidy")) print "skip"; ?>
--FILE-- --FILE--
<?php <?php
$a = tidy_parse_string("<HTML></HTML>"); $a = tidy_parse_string('<HTML></HTML>');
tidy_diagnose($a); var_dump(tidy_diagnose($a));
echo tidy_get_error_buffer($a); echo tidy_get_error_buffer($a);
$html = <<< HTML
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
<head><title>foo</title></head>
<body><p>hello</p></body>
</html>
HTML;
$a = tidy_parse_string($html);
var_dump(tidy_diagnose($a));
echo tidy_get_error_buffer($a);
?> ?>
--EXPECT-- --EXPECT--
bool(true)
line 1 column 1 - Warning: missing <!DOCTYPE> declaration line 1 column 1 - Warning: missing <!DOCTYPE> declaration
line 1 column 7 - Warning: discarding unexpected </html> line 1 column 7 - Warning: discarding unexpected </html>
line 1 column 14 - Warning: inserting missing 'title' element line 1 column 14 - Warning: inserting missing 'title' element
Info: Document content looks like HTML 3.2 Info: Document content looks like HTML 3.2
3 warnings, 0 errors were found! 3 warnings, 0 errors were found!
bool(true)
Info: Document content looks like HTML 3.2
No warnings or errors were found.

2
ext/tidy/tidy.c
View file

@ -1336,7 +1336,7 @@ static PHP_FUNCTION(tidy_diagnose)
{ {
TIDY_FETCH_OBJECT; TIDY_FETCH_OBJECT;
if (tidyStatus(obj->ptdoc->doc) != 0 && tidyRunDiagnostics(obj->ptdoc->doc) >= 0) { if (tidyRunDiagnostics(obj->ptdoc->doc) >= 0) {
tidy_doc_update_properties(obj TSRMLS_CC); tidy_doc_update_properties(obj TSRMLS_CC);
RETURN_TRUE; RETURN_TRUE;
} }