Removed deprecation warning for ticks

diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/bug43027.phpt
index 32f68d0bdd83082b44a1a5ba8f80a9a1d44e9b16..adecf3e39a7db797649c53f7f86887992bff4bf4 100755 (executable)
--- 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 a7fa590f06be9c0a6581df18f8ce8e8bfdbf18d2..10bebc25fc02ec3e57b717ca69045dc9c4a357b0 100644 (file)
--- 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 c255b50234a6c99045362b68aa45003839d1232b..890e134c4fbd2a7cfdcd70a1a11398fd4014dc4f 100644 (file)
--- 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 84147b5ba2c755da88a5c7dfa7a48befa99f4d07..438e05159f21bd508e27cfee5077dbcfe95d7b46 100755 (executable)
--- 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 a0dcb73279cd1ac4566606edb2f2c1898e714f69..3da1408640b9a15ab70ccc4281da408e3b06d63a 100644 (file)
--- 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 a75cb8c4da86f6f5249c9688e21f5d46f61cb7e8..eab2c334c944170b58efe5b9c55a2451d0998ec7 100644 (file)
--- 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 35eb7ed54c90849c6ea986d6235d22e6c0e4df7e..6df389bbb11ce852ac4c1d1b712c70d71ba2f92b 100755 (executable)
--- 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