diff options
| -rwxr-xr-x | Zend/tests/bug43027.phpt | 1 | ||||
| -rw-r--r-- | Zend/tests/jump12.phpt | 1 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 2 | ||||
| -rwxr-xr-x | ext/pcntl/tests/signal_closure_handler.phpt | 1 | ||||
| -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 |
7 files changed, 0 insertions, 13 deletions
diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/bug43027.phpt index 32f68d0bdd..adecf3e39a 100755 --- a/Zend/tests/bug43027.phpt +++ b/Zend/tests/bug43027.phpt @@ -7,5 +7,4 @@ namespace test; echo "ok\n"; ?> --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 a7fa590f06..10bebc25fc 100644 --- a/Zend/tests/jump12.phpt +++ b/Zend/tests/jump12.phpt @@ -14,7 +14,6 @@ c: goto b; ?> --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 c255b50234..890e134c4f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4594,8 +4594,6 @@ 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/pcntl/tests/signal_closure_handler.phpt b/ext/pcntl/tests/signal_closure_handler.phpt index 84147b5ba2..438e05159f 100755 --- a/ext/pcntl/tests/signal_closure_handler.phpt +++ b/ext/pcntl/tests/signal_closure_handler.phpt @@ -20,7 +20,6 @@ echo "Done!\n"; ?> --EXPECTF-- -Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d Start! Signal handler called! Done! diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index a0dcb73279..3da1408640 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5640,8 +5640,6 @@ 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 a75cb8c4da..eab2c334c9 100644 --- a/ext/standard/tests/general_functions/bug41037.phpt +++ b/ext/standard/tests/general_functions/bug41037.phpt @@ -14,9 +14,6 @@ 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 35eb7ed54c..6df389bbb1 100755 --- a/ext/standard/tests/general_functions/closures_002.phpt +++ b/ext/standard/tests/general_functions/closures_002.phpt @@ -17,9 +17,6 @@ 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 |