summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Coggeshall <john@php.net>2004-05-09 14:00:14 +0000
committerJohn Coggeshall <john@php.net>2004-05-09 14:00:14 +0000
commit399022f3c5de92e0e3602e94a0a6a26b2a016868 (patch)
treee275b22db6233d23d150964676e733883ee133ff
parent255d87b1b89bd3ee7f942952a23310fce7307f51 (diff)
downloadphp-git-399022f3c5de92e0e3602e94a0a6a26b2a016868.tar.gz
Renamed tidy_node to tidyNode, removed the tidy_exception class and updated
the tests.
Diffstat
-rw-r--r--ext/tidy/tests/010.phpt24
-rw-r--r--ext/tidy/tests/012.phpt44
-rw-r--r--ext/tidy/tidy.c7
3 files changed, 38 insertions, 37 deletions
diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt
index efeb1b59a9..43cdde7587 100644
--- a/ext/tidy/tests/010.phpt
+++ b/ext/tidy/tests/010.phpt
@@ -15,7 +15,7 @@ Accessing root, body, html, and head nodes..
?>
--EXPECT--
-object(tidy_node)#2 (5) {
+object(tidyNode)#2 (5) {
["value"]=>
string(94) "<html>
<head>
@@ -33,7 +33,7 @@ object(tidy_node)#2 (5) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#3 (6) {
+ &object(tidyNode)#3 (6) {
["value"]=>
string(94) "<html>
<head>
@@ -53,7 +53,7 @@ object(tidy_node)#2 (5) {
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#4 (6) {
+ &object(tidyNode)#4 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -70,7 +70,7 @@ object(tidy_node)#2 (5) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#5 (6) {
+ &object(tidyNode)#5 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -88,7 +88,7 @@ object(tidy_node)#2 (5) {
}
}
[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 (5) {
}
}
}
-object(tidy_node)#2 (6) {
+object(tidyNode)#2 (6) {
["value"]=>
string(49) "<body bgcolor="#FFFFFF" alink="#000000">
</body>
@@ -134,7 +134,7 @@ object(tidy_node)#2 (6) {
["child"]=>
NULL
}
-object(tidy_node)#2 (6) {
+object(tidyNode)#2 (6) {
["value"]=>
string(94) "<html>
<head>
@@ -154,7 +154,7 @@ object(tidy_node)#2 (6) {
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#3 (6) {
+ &object(tidyNode)#3 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -171,7 +171,7 @@ object(tidy_node)#2 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#6 (6) {
+ &object(tidyNode)#6 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -189,7 +189,7 @@ object(tidy_node)#2 (6) {
}
}
[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(tidy_node)#2 (6) {
+object(tidyNode)#2 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -229,7 +229,7 @@ object(tidy_node)#2 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#4 (6) {
+ &object(tidyNode)#4 (6) {
["value"]=>
string(16) "<title></title>
"
diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt
index d4dfa2062e..a23d0e9b80 100644
--- a/ext/tidy/tests/012.phpt
+++ b/ext/tidy/tests/012.phpt
@@ -8,7 +8,7 @@ Accessing children nodes
--FILE--
<?php
- function dump_nodes(tidy_node $node) {
+ function dump_nodes(tidyNode $node) {
var_dump($node->hasChildren());
if($node->hasChildren()) {
@@ -35,7 +35,7 @@ Accessing children nodes
?>
--EXPECT--
bool(true)
-object(tidy_node)#3 (6) {
+object(tidyNode)#3 (6) {
["value"]=>
string(31) "<head>
<title></title>
@@ -52,7 +52,7 @@ object(tidy_node)#3 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#4 (6) {
+ &object(tidyNode)#4 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -70,7 +70,7 @@ object(tidy_node)#3 (6) {
}
}
bool(true)
-object(tidy_node)#4 (6) {
+object(tidyNode)#4 (6) {
["value"]=>
string(16) "<title></title>
"
@@ -85,7 +85,7 @@ object(tidy_node)#4 (6) {
["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 @@ object(tidy_node)#5 (6) {
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#6 (6) {
+ &object(tidyNode)#6 (6) {
["value"]=>
string(9) "<b>Hi</b>"
["name"]=>
@@ -121,7 +121,7 @@ object(tidy_node)#5 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#7 (5) {
+ &object(tidyNode)#7 (5) {
["value"]=>
string(2) "Hi"
["name"]=>
@@ -136,7 +136,7 @@ object(tidy_node)#5 (6) {
}
}
[1]=>
- &object(tidy_node)#8 (6) {
+ &object(tidyNode)#8 (6) {
["value"]=>
string(21) "<i>Bye<u>Test</u></i>"
["name"]=>
@@ -150,7 +150,7 @@ object(tidy_node)#5 (6) {
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#9 (5) {
+ &object(tidyNode)#9 (5) {
["value"]=>
string(3) "Bye"
["name"]=>
@@ -163,7 +163,7 @@ object(tidy_node)#5 (6) {
NULL
}
[1]=>
- &object(tidy_node)#10 (6) {
+ &object(tidyNode)#10 (6) {
["value"]=>
string(11) "<u>Test</u>"
["name"]=>
@@ -177,7 +177,7 @@ object(tidy_node)#5 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#11 (5) {
+ &object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
@@ -196,7 +196,7 @@ object(tidy_node)#5 (6) {
}
}
bool(true)
-object(tidy_node)#6 (6) {
+object(tidyNode)#6 (6) {
["value"]=>
string(9) "<b>Hi</b>"
["name"]=>
@@ -210,7 +210,7 @@ object(tidy_node)#6 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#7 (5) {
+ &object(tidyNode)#7 (5) {
["value"]=>
string(2) "Hi"
["name"]=>
@@ -225,7 +225,7 @@ object(tidy_node)#6 (6) {
}
}
bool(true)
-object(tidy_node)#7 (5) {
+object(tidyNode)#7 (5) {
["value"]=>
string(2) "Hi"
["name"]=>
@@ -237,7 +237,7 @@ object(tidy_node)#7 (5) {
["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 @@ object(tidy_node)#8 (6) {
["child"]=>
array(2) {
[0]=>
- &object(tidy_node)#9 (5) {
+ &object(tidyNode)#9 (5) {
["value"]=>
string(3) "Bye"
["name"]=>
@@ -264,7 +264,7 @@ object(tidy_node)#8 (6) {
NULL
}
[1]=>
- &object(tidy_node)#10 (6) {
+ &object(tidyNode)#10 (6) {
["value"]=>
string(11) "<u>Test</u>"
["name"]=>
@@ -278,7 +278,7 @@ object(tidy_node)#8 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#11 (5) {
+ &object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
@@ -295,7 +295,7 @@ object(tidy_node)#8 (6) {
}
}
bool(true)
-object(tidy_node)#9 (5) {
+object(tidyNode)#9 (5) {
["value"]=>
string(3) "Bye"
["name"]=>
@@ -307,7 +307,7 @@ object(tidy_node)#9 (5) {
["child"]=>
NULL
}
-object(tidy_node)#10 (6) {
+object(tidyNode)#10 (6) {
["value"]=>
string(11) "<u>Test</u>"
["name"]=>
@@ -321,7 +321,7 @@ object(tidy_node)#10 (6) {
["child"]=>
array(1) {
[0]=>
- &object(tidy_node)#11 (5) {
+ &object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
@@ -336,7 +336,7 @@ object(tidy_node)#10 (6) {
}
}
bool(true)
-object(tidy_node)#11 (5) {
+object(tidyNode)#11 (5) {
["value"]=>
string(4) "Test"
["name"]=>
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index b58c2c3e7d..1976f44d08 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -887,9 +887,10 @@ PHP_MINIT_FUNCTION(tidy)
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;
View Lorry Controller Status