lbarnaud Fri Mar 27 02:32:58 2009 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_compile.c
/php-src/ext/standard basic_functions.c
/ZendEngine2/tests bug43027.phpt jump12.phpt
/php-src/ext/pcntl/tests signal_closure_handler.phpt
/php-src/ext/standard/tests/general_functions bug41037.phpt
closures_002.phpt
Log:
Removed deprecation warning for ticks
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.103&r2=1.647.2.27.2.41.2.104&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.103
ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.104
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.103 Tue Mar 10 10:01:44 2009
+++ ZendEngine2/zend_compile.c Fri Mar 27 02:32:56 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.103 2009/03/10 10:01:44 dmitry Exp
$ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.104 2009/03/27 02:32:56 lbarnaud
Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -4594,8 +4594,6 @@
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/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.86&r2=1.725.2.31.2.64.2.87&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.86
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.87
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.86 Mon Jan 19
02:35:21 2009
+++ php-src/ext/standard/basic_functions.c Fri Mar 27 02:32:56 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.86 2009/01/19 02:35:21 pajoye
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.87 2009/03/27 02:32:56 lbarnaud
Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -5640,8 +5640,6 @@
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/ZendEngine2/tests/bug43027.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: ZendEngine2/tests/bug43027.phpt
diff -u ZendEngine2/tests/bug43027.phpt:1.1.2.2
ZendEngine2/tests/bug43027.phpt:1.1.2.3
--- ZendEngine2/tests/bug43027.phpt:1.1.2.2 Thu Jul 17 19:29:34 2008
+++ ZendEngine2/tests/bug43027.phpt Fri Mar 27 02:32:57 2009
@@ -7,5 +7,4 @@
echo "ok\n";
?>
--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.3&r2=1.1.2.4&diff_format=u
Index: ZendEngine2/tests/jump12.phpt
diff -u ZendEngine2/tests/jump12.phpt:1.1.2.3
ZendEngine2/tests/jump12.phpt:1.1.2.4
--- ZendEngine2/tests/jump12.phpt:1.1.2.3 Thu Jul 17 19:29:34 2008
+++ ZendEngine2/tests/jump12.phpt Fri Mar 27 02:32:57 2009
@@ -14,7 +14,6 @@
goto b;
?>
--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/pcntl/tests/signal_closure_handler.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/pcntl/tests/signal_closure_handler.phpt
diff -u php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1.2.4
php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1.2.5
--- php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1.2.4 Tue Aug 5
15:12:19 2008
+++ php-src/ext/pcntl/tests/signal_closure_handler.phpt Fri Mar 27 02:32:57 2009
@@ -20,7 +20,6 @@
?>
--EXPECTF--
-Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d
Start!
Signal handler called!
Done!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41037.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&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.2.1
php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2.2.1
Thu Jul 17 19:29:34 2008
+++ php-src/ext/standard/tests/general_functions/bug41037.phpt Fri Mar 27
02:32:57 2009
@@ -14,9 +14,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
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.3&r2=1.1.2.4&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.3
php-src/ext/standard/tests/general_functions/closures_002.phpt:1.1.2.4
--- php-src/ext/standard/tests/general_functions/closures_002.phpt:1.1.2.3
Thu Jul 17 19:29:34 2008
+++ php-src/ext/standard/tests/general_functions/closures_002.phpt Fri Mar
27 02:32:57 2009
@@ -17,9 +17,6 @@
?>
--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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
