pierrick Fri, 25 Dec 2009 21:24:36 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292635
Log: Changed tidyNode class to disallow manual node creation. Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/tidy/tests/023.phpt U php/php-src/branches/PHP_5_2/ext/tidy/tests/025.phpt U php/php-src/branches/PHP_5_2/ext/tidy/tidy.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/tidy/tests/023.phpt U php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt U php/php-src/branches/PHP_5_3/ext/tidy/tidy.c U php/php-src/trunk/ext/tidy/tests/023.phpt U php/php-src/trunk/ext/tidy/tests/025.phpt U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_2/NEWS 2009-12-25 21:24:36 UTC (rev 292635) @@ -5,8 +5,8 @@ (Ilia) - Removed automatic file descriptor unlocking happening on shutdown and/or stream close (on all OSes excluding Windows). (Tony, Ilia) +- Changed tidyNode class to disallow manual node creation. (Pierrick) - - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey) - Fixed bug #50575 (PDO_PGSQL LOBs are not compatible with PostgreSQL 8.5). Modified: php/php-src/branches/PHP_5_2/ext/tidy/tests/023.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/tidy/tests/023.phpt 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_2/ext/tidy/tests/023.phpt 2009-12-25 21:24:36 UTC (rev 292635) @@ -6,16 +6,11 @@ <?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 @@ ?> --EXPECT-- -object(tidyNode)#1 (0) { -} object(tidy)#1 (2) { ["errorBuffer"]=> NULL @@ -39,7 +32,6 @@ NULL } ------- -bool(false) bool(true) bool(true) bool(false) Modified: php/php-src/branches/PHP_5_2/ext/tidy/tests/025.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/tidy/tests/025.phpt 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_2/ext/tidy/tests/025.phpt 2009-12-25 21:24:36 UTC (rev 292635) @@ -5,15 +5,6 @@ --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 @@ ?> --EXPECT-- -bool(false) -bool(false) -bool(false) -bool(false) -string(0) "" bool(true) bool(true) bool(true) Modified: php/php-src/branches/PHP_5_2/ext/tidy/tidy.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/tidy/tidy.c 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_2/ext/tidy/tidy.c 2009-12-25 21:24:36 UTC (rev 292635) @@ -266,6 +266,7 @@ 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) @@ -341,6 +342,7 @@ TIDY_NODE_ME(isAsp, NULL) TIDY_NODE_ME(isPhp, NULL) TIDY_NODE_ME(getParent, NULL) + TIDY_NODE_ME(__construct, NULL) {NULL, NULL, NULL} }; @@ -1675,6 +1677,14 @@ } /* }}} */ +/* {{{ 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); Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_3/NEWS 2009-12-25 21:24:36 UTC (rev 292635) @@ -16,6 +16,7 @@ (David Soria Parra) - Changed "post_max_size" php.ini directive to allow unlimited post size by setting it to 0. (Rasmus) +- Changed tidyNode class to disallow manual node creation. (Pierrick) - Removed automatic file descriptor unlocking happening on shutdown and/or stream close (on all OSes). (Tony, Ilia) Modified: php/php-src/branches/PHP_5_3/ext/tidy/tests/023.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/tidy/tests/023.phpt 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_3/ext/tidy/tests/023.phpt 2009-12-25 21:24:36 UTC (rev 292635) @@ -6,16 +6,11 @@ <?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 @@ ?> --EXPECT-- -object(tidyNode)#1 (0) { -} object(tidy)#1 (2) { ["errorBuffer"]=> NULL @@ -39,7 +32,6 @@ NULL } ------- -bool(false) bool(true) bool(true) bool(false) Modified: php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt 2009-12-25 21:24:36 UTC (rev 292635) @@ -5,15 +5,6 @@ --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 @@ ?> --EXPECT-- -bool(false) -bool(false) -bool(false) -bool(false) -string(0) "" bool(true) bool(true) bool(true) Modified: php/php-src/branches/PHP_5_3/ext/tidy/tidy.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/tidy/tidy.c 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/branches/PHP_5_3/ext/tidy/tidy.c 2009-12-25 21:24:36 UTC (rev 292635) @@ -266,6 +266,7 @@ 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) @@ -441,6 +442,7 @@ TIDY_NODE_ME(isAsp, NULL) TIDY_NODE_ME(isPhp, NULL) TIDY_NODE_ME(getParent, NULL) + TIDY_NODE_ME(__construct, NULL) {NULL, NULL, NULL} }; @@ -1775,6 +1777,14 @@ } /* }}} */ +/* {{{ 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); Modified: php/php-src/trunk/ext/tidy/tests/023.phpt =================================================================== --- php/php-src/trunk/ext/tidy/tests/023.phpt 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/trunk/ext/tidy/tests/023.phpt 2009-12-25 21:24:36 UTC (rev 292635) @@ -6,16 +6,11 @@ <?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 @@ ?> --EXPECT-- -object(tidyNode)#1 (0) { -} object(tidy)#1 (2) { [u"errorBuffer"]=> NULL @@ -39,7 +32,6 @@ NULL } ------- -bool(false) bool(true) bool(true) bool(false) Modified: php/php-src/trunk/ext/tidy/tests/025.phpt =================================================================== --- php/php-src/trunk/ext/tidy/tests/025.phpt 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/trunk/ext/tidy/tests/025.phpt 2009-12-25 21:24:36 UTC (rev 292635) @@ -5,15 +5,6 @@ --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 @@ ?> --EXPECT-- -bool(false) -bool(false) -bool(false) -bool(false) -unicode(0) "" bool(true) bool(true) bool(true) Modified: php/php-src/trunk/ext/tidy/tidy.c =================================================================== --- php/php-src/trunk/ext/tidy/tidy.c 2009-12-25 21:01:06 UTC (rev 292634) +++ php/php-src/trunk/ext/tidy/tidy.c 2009-12-25 21:24:36 UTC (rev 292635) @@ -275,6 +275,7 @@ 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 @@ 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 @@ /* }}} */ +/* {{{ 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);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php