diff options
| -rwxr-xr-x | Zend/tests/bug43027.phpt | 3 | ||||
| -rw-r--r-- | Zend/tests/jump12.phpt | 3 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 2 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/bug41037.phpt | 3 | ||||
| -rwxr-xr-x | ext/standard/tests/general_functions/closures_002.phpt | 3 |
6 files changed, 14 insertions, 2 deletions
diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/bug43027.phpt index 2cf2d1d6a5..32f68d0bdd 100755 --- a/Zend/tests/bug43027.phpt +++ b/Zend/tests/bug43027.phpt @@ -6,5 +6,6 @@ declare(ticks=1); namespace test; echo "ok\n"; ?> ---EXPECT-- +--EXPECTF-- +Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d ok diff --git a/Zend/tests/jump12.phpt b/Zend/tests/jump12.phpt index 3c244d6181..a7fa590f06 100644 --- a/Zend/tests/jump12.phpt +++ b/Zend/tests/jump12.phpt @@ -13,7 +13,8 @@ c: 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! diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7a8a2c3af4..f709132544 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4592,6 +4592,8 @@ void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) 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; diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index afa41e7209..9a0d11022f 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -6031,6 +6031,8 @@ PHP_FUNCTION(register_tick_function) 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); diff --git a/ext/standard/tests/general_functions/bug41037.phpt b/ext/standard/tests/general_functions/bug41037.phpt index eab2c334c9..a75cb8c4da 100644 --- a/ext/standard/tests/general_functions/bug41037.phpt +++ b/ext/standard/tests/general_functions/bug41037.phpt @@ -14,6 +14,9 @@ register_tick_function('a'); 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 diff --git a/ext/standard/tests/general_functions/closures_002.phpt b/ext/standard/tests/general_functions/closures_002.phpt index 6df389bbb1..35eb7ed54c 100755 --- a/ext/standard/tests/general_functions/closures_002.phpt +++ b/ext/standard/tests/general_functions/closures_002.phpt @@ -17,6 +17,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 Test %d %d |