john Sun May 9 10:00:14 2004 EDT
Modified files:
/php-src/ext/tidy tidy.c
/php-src/ext/tidy/tests 010.phpt 012.phpt
Log:
Renamed tidy_node to tidyNode, removed the tidy_exception class and updated
the tests.
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.49&r2=1.50&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.49 php-src/ext/tidy/tidy.c:1.50
--- php-src/ext/tidy/tidy.c:1.49 Tue Apr 20 14:28:09 2004
+++ php-src/ext/tidy/tidy.c Sun May 9 10:00:14 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.49 2004/04/20 18:28:09 john Exp $ */
+/* $Id: tidy.c,v 1.50 2004/05/09 14:00:14 john Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -887,9 +887,10 @@
REGISTER_INI_ENTRIES();
REGISTER_TIDY_CLASS(tidy, doc, NULL);
- REGISTER_TIDY_CLASS(tidy_node, node, NULL);
- REGISTER_TIDY_CLASS(tidy_exception, exception, zend_exception_get_default());
-
+ REGISTER_TIDY_CLASS(tidyNode, node, NULL);
+ /* no exceptions for now..
+ REGISTER_TIDY_CLASS(tidyException, exception, zend_exception_get_default());
+ */
tidy_object_handlers_doc.get_class_entry = tidy_get_ce_doc;
tidy_object_handlers_node.get_class_entry = tidy_get_ce_node;
@@ -929,7 +930,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.49 2004/04/20 18:28:09 john Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.50 2004/05/09 14:00:14 john Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
http://cvs.php.net/diff.php/php-src/ext/tidy/tests/010.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/tidy/tests/010.phpt
diff -u php-src/ext/tidy/tests/010.phpt:1.2 php-src/ext/tidy/tests/010.phpt:1.3
--- php-src/ext/tidy/tests/010.phpt:1.2 Tue Jan 13 21:43:33 2004
+++ php-src/ext/tidy/tests/010.phpt Sun May 9 10:00:14 2004
@@ -15,7 +15,7 @@
?>
--EXPECT--
-object(tidy_node)#2 (5) {
+object(tidyNode)#2 (5) {
["value"]=>
string(94) "<html>
<head>
@@ -33,7 +33,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#3 (6) {
+ &object(tidyNode)#3 (6) {
["value"]=>
string(94) "<html>
<head>
@@ -53,7 +53,7 @@
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#4 (6) {
+ &object(tidyNode)#4 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -70,7 +70,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#5 (6) {
+ &object(tidyNode)#5 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -88,7 +88,7 @@
}
}
[1]=>
- &object(tidy_node)#6 (6) {
+ &object(tidyNode)#6 (6) {
["value"]=>
string(49) "<body bgcolor="#FFFFFF" alink="#000000">
</body>
@@ -113,7 +113,7 @@
}
}
}
-object(tidy_node)#2 (6) {
+object(tidyNode)#2 (6) {
["value"]=>
string(49) "<body bgcolor="#FFFFFF" alink="#000000">
</body>
@@ -134,7 +134,7 @@
["child"]=>
NULL
}
-object(tidy_node)#2 (6) {
+object(tidyNode)#2 (6) {
["value"]=>
string(94) "<html>
<head>
@@ -154,7 +154,7 @@
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#3 (6) {
+ &object(tidyNode)#3 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -171,7 +171,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#6 (6) {
+ &object(tidyNode)#6 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -189,7 +189,7 @@
}
}
[1]=>
- &object(tidy_node)#4 (6) {
+ &object(tidyNode)#4 (6) {
["value"]=>
string(49) "<body bgcolor="#FFFFFF" alink="#000000">
</body>
@@ -212,7 +212,7 @@
}
}
}
-object(tidy_node)#2 (6) {
+object(tidyNode)#2 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -229,7 +229,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#4 (6) {
+ &object(tidyNode)#4 (6) {
["value"]=>
string(16) "<title></title>
"
http://cvs.php.net/diff.php/php-src/ext/tidy/tests/012.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/tidy/tests/012.phpt
diff -u php-src/ext/tidy/tests/012.phpt:1.3 php-src/ext/tidy/tests/012.phpt:1.4
--- php-src/ext/tidy/tests/012.phpt:1.3 Wed Feb 4 20:38:59 2004
+++ php-src/ext/tidy/tests/012.phpt Sun May 9 10:00:14 2004
@@ -8,7 +8,7 @@
--FILE--
<?php
- function dump_nodes(tidy_node $node) {
+ function dump_nodes(tidyNode $node) {
var_dump($node->hasChildren());
if($node->hasChildren()) {
@@ -35,7 +35,7 @@
?>
--EXPECT--
bool(true)
-object(tidy_node)#3 (6) {
+object(tidyNode)#3 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -52,7 +52,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#4 (6) {
+ &object(tidyNode)#4 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -70,7 +70,7 @@
}
}
bool(true)
-object(tidy_node)#4 (6) {
+object(tidyNode)#4 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -85,7 +85,7 @@
["child"]=>
NULL
}
-object(tidy_node)#5 (6) {
+object(tidyNode)#5 (6) {
["value"]=>
string(80) "<body bgcolor="#FFFFFF" alink="#000000">
<b>Hi</b><i>Bye<u>Test</u></i>
@@ -107,7 +107,7 @@
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#6 (6) {
+ &object(tidyNode)#6 (6) {
["value"]=>
string(9) "<b>Hi</b>"
["name"]=>
@@ -121,7 +121,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#7 (5) {
+ &object(tidyNode)#7 (5) {
["value"]=>
string(2) "Hi"
["name"]=>
@@ -136,7 +136,7 @@
}
}
[1]=>
- &object(tidy_node)#8 (6) {
+ &object(tidyNode)#8 (6) {
["value"]=>
string(21) "<i>Bye<u>Test</u></i>"
["name"]=>
@@ -150,7 +150,7 @@
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#9 (5) {
+ &object(tidyNode)#9 (5) {
["value"]=>
string(3) "Bye"
["name"]=>
@@ -163,7 +163,7 @@
NULL
}
[1]=>
- &object(tidy_node)#10 (6) {
+ &object(tidyNode)#10 (6) {
["value"]=>
string(11) "<u>Test</u>"
["name"]=>
@@ -177,7 +177,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#11 (5) {
+ &object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
@@ -196,7 +196,7 @@
}
}
bool(true)
-object(tidy_node)#6 (6) {
+object(tidyNode)#6 (6) {
["value"]=>
string(9) "<b>Hi</b>"
["name"]=>
@@ -210,7 +210,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#7 (5) {
+ &object(tidyNode)#7 (5) {
["value"]=>
string(2) "Hi"
["name"]=>
@@ -225,7 +225,7 @@
}
}
bool(true)
-object(tidy_node)#7 (5) {
+object(tidyNode)#7 (5) {
["value"]=>
string(2) "Hi"
["name"]=>
@@ -237,7 +237,7 @@
["child"]=>
NULL
}
-object(tidy_node)#8 (6) {
+object(tidyNode)#8 (6) {
["value"]=>
string(21) "<i>Bye<u>Test</u></i>"
["name"]=>
@@ -251,7 +251,7 @@
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#9 (5) {
+ &object(tidyNode)#9 (5) {
["value"]=>
string(3) "Bye"
["name"]=>
@@ -264,7 +264,7 @@
NULL
}
[1]=>
- &object(tidy_node)#10 (6) {
+ &object(tidyNode)#10 (6) {
["value"]=>
string(11) "<u>Test</u>"
["name"]=>
@@ -278,7 +278,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#11 (5) {
+ &object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
@@ -295,7 +295,7 @@
}
}
bool(true)
-object(tidy_node)#9 (5) {
+object(tidyNode)#9 (5) {
["value"]=>
string(3) "Bye"
["name"]=>
@@ -307,7 +307,7 @@
["child"]=>
NULL
}
-object(tidy_node)#10 (6) {
+object(tidyNode)#10 (6) {
["value"]=>
string(11) "<u>Test</u>"
["name"]=>
@@ -321,7 +321,7 @@
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#11 (5) {
+ &object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
@@ -336,7 +336,7 @@
}
}
bool(true)
-object(tidy_node)#11 (5) {
+object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
