Re: cvs: php-src(PHP_5_3) /ext/standard basic_functions.c /ext/standard/tests/general_functions bug41037.phpt closures_002.phpt ZendEngine2
zend_compile.c ZendEngine2/tests bug43027.phpt jump12.phpt

Isn't "ticks" plural? ;) "ticks is" -> "ticks are" --Jani Felipe Pena kirjoitti:

felipe Thu Jul 17 19:29:34 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_compile.c     /ZendEngine2/tests	bug43027.phpt jump12.phpt     /php-src/ext/standard	basic_functions.c     /php-src/ext/standard/tests/general_functions	bug41037.phpt                                                  	closures_002.phpt   Log:

- Deprecate ticks http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.72&r2=1.647.2.27.2.41.2.73&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.72 ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.73 --- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.72 Mon Jul 14 12:18:20 2008 +++ ZendEngine2/zend_compile.c Thu Jul 17 19:29:34 2008 @@ -17,7 +17,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.72 2008/07/14 12:18:20 dmitry Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.73 2008/07/17 19:29:34 felipe Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -4592,6 +4592,8 @@ if (!zend_binary_strcasecmp(var->u.constant.value.str.val, var->u.constant.value.str.len, "ticks", sizeof("ticks")-1)) { convert_to_long(&val->u.constant); CG(declarables).ticks = val->u.constant; + + zend_error(E_DEPRECATED, "Ticks is deprecated and will be removed in PHP 6"); #ifdef ZEND_MULTIBYTE } else if (!zend_binary_strcasecmp(var->u.constant.value.str.val, var->u.constant.value.str.len, "encoding", sizeof("encoding")-1)) { zend_encoding *new_encoding, *old_encoding; http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug43027.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: ZendEngine2/tests/bug43027.phpt diff -u ZendEngine2/tests/bug43027.phpt:1.1.2.1 ZendEngine2/tests/bug43027.phpt:1.1.2.2 --- ZendEngine2/tests/bug43027.phpt:1.1.2.1 Thu Nov 1 11:58:58 2007 +++ ZendEngine2/tests/bug43027.phpt Thu Jul 17 19:29:34 2008 @@ -6,5 +6,6 @@ namespace test; echo "ok\n"; ?> ---EXPECT-- +--EXPECTF-- +Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d ok http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/jump12.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: ZendEngine2/tests/jump12.phpt diff -u ZendEngine2/tests/jump12.phpt:1.1.2.2 ZendEngine2/tests/jump12.phpt:1.1.2.3 --- ZendEngine2/tests/jump12.phpt:1.1.2.2 Fri Mar 28 14:35:01 2008 +++ ZendEngine2/tests/jump12.phpt Thu Jul 17 19:29:34 2008 @@ -13,7 +13,8 @@

     print "ok!\n";
     goto b;

?> ---EXPECT-- +--EXPECTF-- +Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d ok! ok! ok! http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.36&r2=1.725.2.31.2.64.2.37&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.36 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.37 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.36 Thu Jul 17 09:53:42 2008 +++ php-src/ext/standard/basic_functions.c Thu Jul 17 19:29:34 2008 @@ -18,7 +18,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.36 2008/07/17 09:53:42 dmitry Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.37 2008/07/17 19:29:34 felipe Exp $ */ #include "php.h" #include "php_streams.h" @@ -6031,6 +6031,8 @@ if (tick_fe.arg_count < 1) { WRONG_PARAM_COUNT; } + + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "Ticks is deprecated and will be removed in PHP 6"); tick_fe.arguments = (zval **) safe_emalloc(sizeof(zval *), tick_fe.arg_count, 0); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41037.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/bug41037.phpt diff -u php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2 Tue Apr 10 09:37:09 2007 +++ php-src/ext/standard/tests/general_functions/bug41037.phpt Thu Jul 17 19:29:34 2008 @@ -14,6 +14,9 @@ echo "Done\n"; ?> --EXPECTF-- +Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d + +Deprecated: register_tick_function(): Ticks is deprecated and will be removed in PHP 6 in %s on line %d hello Warning: unregister_tick_function(): Unable to delete tick function executed at the moment in %s on line %d Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/closures_002.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/closures_002.phpt diff -u php-src/ext/standard/tests/general_functions/closures_002.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/closures_002.phpt:1.1.2.3 --- php-src/ext/standard/tests/general_functions/closures_002.phpt:1.1.2.2 Thu Jul 17 09:53:42 2008 +++ php-src/ext/standard/tests/general_functions/closures_002.phpt Thu Jul 17 19:29:34 2008 @@ -17,6 +17,9 @@ ?> --EXPECTF-- +Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d + +Deprecated: register_tick_function(): Ticks is deprecated and will be removed in PHP 6 in %s on line %d Test %d %d