]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07d9381)
Changed tidyNode class to disallow manual node creation.
authorPierrick Charron <pierrick@php.net>
Fri, 25 Dec 2009 21:24:36 +0000 (21:24 +0000)
committerPierrick Charron <pierrick@php.net>
Fri, 25 Dec 2009 21:24:36 +0000 (21:24 +0000)
ext/tidy/tests/023.phpt patch | blob | history
ext/tidy/tests/025.phpt patch | blob | history
ext/tidy/tidy.c patch | blob | history

diff --git a/ext/tidy/tests/023.phpt b/ext/tidy/tests/023.phpt
index fd299f9cfe1c3deca94398aa6aae100fa072c53f..cc2ed998771d9ce5c5b5840526e1382930f81497 100644 (file)
--- a/ext/tidy/tests/023.phpt
+++ b/ext/tidy/tests/023.phpt
@@ -6,16 +6,11 @@ tidy and tidyNode OO
 <?php
 
 //test leaks here:
-new tidyNode();
-var_dump(new tidyNode());
 new tidy();
 var_dump(new tidy());
 
 echo "-------\n";
 
-$x = new tidyNode();
-var_dump($x->isHtml());
-
 $tidy = new tidy();
 $tidy->parseString('<html><?php echo "xpto;" ?></html>');
 
@@ -30,8 +25,6 @@ var_dump(tidy_get_root($tidy)->child[0]->child[0]->hasChildren());
 
 ?>
 --EXPECT--
-object(tidyNode)#1 (0) {
-}
 object(tidy)#1 (2) {
   [u"errorBuffer"]=>
   NULL
@@ -39,7 +32,6 @@ object(tidy)#1 (2) {
   NULL
 }
 -------
-bool(false)
 bool(true)
 bool(true)
 bool(false)
diff --git a/ext/tidy/tests/025.phpt b/ext/tidy/tests/025.phpt
index 66e47e4a87f15dab3c6cecf6f4e945723265b1eb..b1c735e24bd474bfe672a2ee2d7be69e13940cfd 100644 (file)
--- a/ext/tidy/tests/025.phpt
+++ b/ext/tidy/tests/025.phpt
@@ -5,15 +5,6 @@ tidyNode tests
 --FILE--
 <?php
 
-new tidyNode;
-$node = new tidyNode();
-
-var_dump($node->isPhp());
-var_dump($node->isText());
-var_dump($node->isComment());
-var_dump($node->hasSiblings());
-var_dump((string)$node);
-
 $tidy=tidy_parse_string('<% %>');
 var_dump($tidy->Root()->child[0]->isAsp());
 
@@ -34,11 +25,6 @@ var_dump($tidy->Root()->child[0]->child[0]->hasSiblings());
 
 ?>
 --EXPECT--
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-unicode(0) ""
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 371474e41957fe1b69146cd758fab613cc80d31d..7628bd892e3721510c4fc8b62deffcee2307ee4f 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -275,6 +275,7 @@ static TIDY_NODE_METHOD(isJste);
 static TIDY_NODE_METHOD(isAsp);
 static TIDY_NODE_METHOD(isPhp);
 static TIDY_NODE_METHOD(getParent);
+static TIDY_NODE_METHOD(__construct);
 /* }}} */
 
 ZEND_DECLARE_MODULE_GLOBALS(tidy)
@@ -443,6 +444,7 @@ static const zend_function_entry tidy_funcs_node[] = {
        TIDY_NODE_ME(isAsp, NULL)
        TIDY_NODE_ME(isPhp, NULL)
        TIDY_NODE_ME(getParent, NULL)
+       TIDY_NODE_ME(__construct, NULL)
        {NULL, NULL, NULL}
 };
 
@@ -1880,6 +1882,14 @@ static TIDY_NODE_METHOD(getParent)
 /* }}} */
 
 
+/* {{{ proto void tidyNode::__construct()
+         __constructor for tidyNode. */
+static TIDY_NODE_METHOD(__construct)
+{
+       php_error_docref(NULL TSRMLS_CC, E_ERROR, "You should not create a tidyNode manually");
+}   
+/* }}} */
+
 static void _php_tidy_register_nodetypes(INIT_FUNC_ARGS)
 {
        TIDY_NODE_CONST(ROOT, Root);
Unnamed repository; edit this file 'description' to name the repository.