helly Sat Feb 23 17:03:53 2008 UTC
Modified files:
/ZendEngine2 zend.c zend_builtin_functions.c zend_compile.c
zend_constants.c zend_errors.h zend_execute_API.c
zend_language_parser.y zend_vm_def.h zend_vm_execute.h
/ZendEngine2/tests bug33771.phpt error_reporting01.phpt
error_reporting02.phpt error_reporting03.phpt
error_reporting04.phpt error_reporting05.phpt
error_reporting06.phpt error_reporting07.phpt
error_reporting08.phpt error_reporting09.phpt
error_reporting10.phpt is_a.phpt
/php-src/ext/date php_date.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/standard dl.c file.c string.c
/php-src/ext/standard/tests/serialize bug31402.phpt
/php-src/main main.c
/php-src/tests/classes new_001.phpt
/php-src/tests/lang bug20175.phpt bug22231.phpt bug22510.phpt
Log:
- Add E_DEPRECATED (Lars Strojny, Felipe Pena, Marcus)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.406&r2=1.407&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.406 ZendEngine2/zend.c:1.407
--- ZendEngine2/zend.c:1.406 Mon Jan 28 20:33:50 2008
+++ ZendEngine2/zend.c Sat Feb 23 17:03:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.406 2008/01/28 20:33:50 derick Exp $ */
+/* $Id: zend.c,v 1.407 2008/02/23 17:03:51 helly Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -74,7 +74,7 @@
static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */
{
if (!new_value) {
- EG(error_reporting) = E_ALL & ~E_NOTICE & ~E_STRICT;
+ EG(error_reporting) = E_ALL & ~E_NOTICE & ~E_STRICT &
~E_DEPRECATED;
} else {
EG(error_reporting) = atoi(new_value);
}
@@ -1481,6 +1481,7 @@
case E_ERROR:
case E_NOTICE:
case E_STRICT:
+ case E_DEPRECATED:
case E_WARNING:
case E_USER_ERROR:
case E_USER_WARNING:
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.366&r2=1.367&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.366
ZendEngine2/zend_builtin_functions.c:1.367
--- ZendEngine2/zend_builtin_functions.c:1.366 Thu Feb 21 15:14:38 2008
+++ ZendEngine2/zend_builtin_functions.c Sat Feb 23 17:03:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.366 2008/02/21 15:14:38 dmitry Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.367 2008/02/23 17:03:51 helly Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -124,7 +124,7 @@
ZEND_FE(get_included_files, NULL)
ZEND_FALIAS(get_required_files, get_included_files, NULL)
ZEND_FE(is_subclass_of, NULL)
- ZEND_FE(is_a, NULL)
+ ZEND_DEP_FE(is_a, NULL)
ZEND_FE(get_class_vars, NULL)
ZEND_FE(get_object_vars, NULL)
ZEND_FE(get_class_methods, NULL)
@@ -740,7 +740,6 @@
Returns true if the object is of this class or has this class as one of its
parents */
ZEND_FUNCTION(is_a)
{
- zend_error(E_STRICT, "is_a(): Deprecated. Please use the instanceof
operator");
is_a_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.802&r2=1.803&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.802 ZendEngine2/zend_compile.c:1.803
--- ZendEngine2/zend_compile.c:1.802 Wed Feb 20 12:06:28 2008
+++ ZendEngine2/zend_compile.c Sat Feb 23 17:03:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.802 2008/02/20 12:06:28 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.803 2008/02/23 17:03:51 helly Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -2032,13 +2032,13 @@
function_ptr->common.function_name.v &&
function_ptr->common.type == ZEND_USER_FUNCTION &&
!ARG_SHOULD_BE_SENT_BY_REF(function_ptr, (zend_uint)
offset)) {
- zend_error(E_STRICT,
+ zend_error(E_DEPRECATED,
"Call-time pass-by-reference has been
deprecated; "
"if you would like to pass argument by
reference, modify the declaration of %R().",
UG(unicode)?IS_UNICODE:IS_STRING,
function_ptr->common.function_name.v);
} else{
- zend_error(E_STRICT,
+ zend_error(E_DEPRECATED,
"Call-time pass-by-reference has been
deprecated");
}
send_by_reference = 1;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_constants.c?r1=1.108&r2=1.109&diff_format=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.108 ZendEngine2/zend_constants.c:1.109
--- ZendEngine2/zend_constants.c:1.108 Tue Feb 19 12:01:14 2008
+++ ZendEngine2/zend_constants.c Sat Feb 23 17:03:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_constants.c,v 1.108 2008/02/19 12:01:14 dmitry Exp $ */
+/* $Id: zend_constants.c,v 1.109 2008/02/23 17:03:51 helly Exp $ */
#include "zend.h"
#include "zend_constants.h"
@@ -104,6 +104,7 @@
REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT |
CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT |
CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_STRICT", E_STRICT, CONST_PERSISTENT |
CONST_CS);
+ REGISTER_MAIN_LONG_CONSTANT("E_DEPRECATED", E_DEPRECATED,
CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR,
CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING,
CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR,
CONST_PERSISTENT | CONST_CS);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_errors.h?r1=1.24&r2=1.25&diff_format=u
Index: ZendEngine2/zend_errors.h
diff -u ZendEngine2/zend_errors.h:1.24 ZendEngine2/zend_errors.h:1.25
--- ZendEngine2/zend_errors.h:1.24 Mon Dec 31 07:12:06 2007
+++ ZendEngine2/zend_errors.h Sat Feb 23 17:03:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_errors.h,v 1.24 2007/12/31 07:12:06 sebastian Exp $ */
+/* $Id: zend_errors.h,v 1.25 2008/02/23 17:03:51 helly Exp $ */
#ifndef ZEND_ERRORS_H
#define ZEND_ERRORS_H
@@ -35,8 +35,9 @@
#define E_USER_NOTICE (1<<10L)
#define E_STRICT (1<<11L)
#define E_RECOVERABLE_ERROR (1<<12L)
+#define E_DEPRECATED (1<<13L)
-#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR |
E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR |
E_USER_WARNING | E_USER_NOTICE | E_STRICT | E_RECOVERABLE_ERROR)
+#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR |
E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR |
E_USER_WARNING | E_USER_NOTICE | E_STRICT | E_RECOVERABLE_ERROR | E_DEPRECATED)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
#endif /* ZEND_ERRORS_H */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.437&r2=1.438&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.437
ZendEngine2/zend_execute_API.c:1.438
--- ZendEngine2/zend_execute_API.c:1.437 Sat Feb 2 15:46:19 2008
+++ ZendEngine2/zend_execute_API.c Sat Feb 23 17:03:51 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.437 2008/02/02 15:46:19 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.438 2008/02/23 17:03:51 helly Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -1033,7 +1033,7 @@
zend_error_noreturn(E_ERROR, "Cannot call abstract
method %v::%v()", EX(function_state).function->common.scope->name,
EX(function_state).function->common.function_name);
}
if (EX(function_state).function->common.fn_flags &
ZEND_ACC_DEPRECATED) {
- zend_error(E_STRICT, "Function %v%s%v() is deprecated",
+ zend_error(E_DEPRECATED, "Function %v%s%v() is
deprecated",
EX(function_state).function->common.scope ?
EX(function_state).function->common.scope->name : EMPTY_ZSTR,
EX(function_state).function->common.scope ?
"::" : "",
EX(function_state).function->common.function_name);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.203&r2=1.204&diff_format=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.203
ZendEngine2/zend_language_parser.y:1.204
--- ZendEngine2/zend_language_parser.y:1.203 Tue Feb 12 09:28:17 2008
+++ ZendEngine2/zend_language_parser.y Sat Feb 23 17:03:51 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.203 2008/02/12 09:28:17 dmitry Exp $ */
+/* $Id: zend_language_parser.y,v 1.204 2008/02/23 17:03:51 helly Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -570,7 +570,7 @@
T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')'
'=' expr { zend_do_list_end(&$$, &$7 TSRMLS_CC); }
| variable '=' expr {
zend_check_writable_variable(&$1); zend_do_assign(&$$, &$1, &$3 TSRMLS_CC); }
| variable '=' '&' variable { zend_check_writable_variable(&$1);
zend_do_end_variable_parse(BP_VAR_W, 1 TSRMLS_CC);
zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1,
&$4 TSRMLS_CC); }
- | variable '=' '&' T_NEW class_name_reference {
zend_error(E_STRICT, "Assigning the return value of new by reference is
deprecated"); zend_check_writable_variable(&$1);
zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5
TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$4, &$7 TSRMLS_CC);
zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(BP_VAR_W, 0
TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); }
+ | variable '=' '&' T_NEW class_name_reference {
zend_error(E_DEPRECATED, "Assigning the return value of new by reference is
deprecated"); zend_check_writable_variable(&$1);
zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5
TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$4, &$7 TSRMLS_CC);
zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(BP_VAR_W, 0
TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); }
| T_NEW class_name_reference {
zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$1, &$2
TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$$, &$1, &$4 TSRMLS_CC);
zend_do_extended_fcall_end(TSRMLS_C); $$.u.EA.type = ZEND_PARSED_NEW; }
| T_CLONE expr { zend_do_clone(&$$, &$2 TSRMLS_CC); }
| variable T_PLUS_EQUAL expr {
zend_check_writable_variable(&$1); zend_do_end_variable_parse(BP_VAR_RW, 0
TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_ADD, &$$, &$1, &$3 TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.214&r2=1.215&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.214 ZendEngine2/zend_vm_def.h:1.215
--- ZendEngine2/zend_vm_def.h:1.214 Wed Feb 20 12:06:28 2008
+++ ZendEngine2/zend_vm_def.h Sat Feb 23 17:03:51 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.214 2008/02/20 12:06:28 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.215 2008/02/23 17:03:51 helly Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -2129,7 +2129,7 @@
ZEND_VM_NEXT_OPCODE(); /* Never reached */
}
if (EX(function_state).function->common.fn_flags &
ZEND_ACC_DEPRECATED) {
- zend_error(E_STRICT, "Function %v%s%v() is deprecated",
+ zend_error(E_DEPRECATED, "Function %v%s%v() is
deprecated",
EX(function_state).function->common.scope ?
EX(function_state).function->common.scope->name : EMPTY_ZSTR,
EX(function_state).function->common.scope ?
"::" : "",
EX(function_state).function->common.function_name);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.218&r2=1.219&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.218 ZendEngine2/zend_vm_execute.h:1.219
--- ZendEngine2/zend_vm_execute.h:1.218 Wed Feb 20 12:06:28 2008
+++ ZendEngine2/zend_vm_execute.h Sat Feb 23 17:03:52 2008
@@ -141,7 +141,7 @@
ZEND_VM_NEXT_OPCODE(); /* Never reached */
}
if (EX(function_state).function->common.fn_flags &
ZEND_ACC_DEPRECATED) {
- zend_error(E_STRICT, "Function %v%s%v() is deprecated",
+ zend_error(E_DEPRECATED, "Function %v%s%v() is
deprecated",
EX(function_state).function->common.scope ?
EX(function_state).function->common.scope->name : EMPTY_ZSTR,
EX(function_state).function->common.scope ?
"::" : "",
EX(function_state).function->common.function_name);
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug33771.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/bug33771.phpt
diff -u ZendEngine2/tests/bug33771.phpt:1.4 ZendEngine2/tests/bug33771.phpt:1.5
--- ZendEngine2/tests/bug33771.phpt:1.4 Mon May 7 16:50:40 2007
+++ ZendEngine2/tests/bug33771.phpt Sat Feb 23 17:03:52 2008
@@ -34,7 +34,7 @@
echo "Done\n";
?>
--EXPECTF--
-int(8191)
-int(8191)
-int(6143)
+int(16383)
+int(16383)
+int(14335)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting01.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/error_reporting01.phpt
diff -u ZendEngine2/tests/error_reporting01.phpt:1.4
ZendEngine2/tests/error_reporting01.phpt:1.5
--- ZendEngine2/tests/error_reporting01.phpt:1.4 Thu Mar 16 12:12:31 2006
+++ ZendEngine2/tests/error_reporting01.phpt Sat Feb 23 17:03:52 2008
@@ -22,5 +22,5 @@
echo "Done\n";
?>
--EXPECT--
-int(6143)
+int(14335)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting02.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/error_reporting02.phpt
diff -u ZendEngine2/tests/error_reporting02.phpt:1.3
ZendEngine2/tests/error_reporting02.phpt:1.4
--- ZendEngine2/tests/error_reporting02.phpt:1.3 Fri Sep 23 10:28:23 2005
+++ ZendEngine2/tests/error_reporting02.phpt Sat Feb 23 17:03:52 2008
@@ -23,5 +23,5 @@
echo "Done\n";
?>
--EXPECT--
-int(8191)
+int(16383)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting03.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/error_reporting03.phpt
diff -u ZendEngine2/tests/error_reporting03.phpt:1.3
ZendEngine2/tests/error_reporting03.phpt:1.4
--- ZendEngine2/tests/error_reporting03.phpt:1.3 Fri Sep 23 10:28:23 2005
+++ ZendEngine2/tests/error_reporting03.phpt Sat Feb 23 17:03:52 2008
@@ -33,5 +33,5 @@
?>
--EXPECTF--
Notice: Undefined variable: undef2 in %s on line %d
-int(8191)
+int(16383)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting04.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/error_reporting04.phpt
diff -u ZendEngine2/tests/error_reporting04.phpt:1.3
ZendEngine2/tests/error_reporting04.phpt:1.4
--- ZendEngine2/tests/error_reporting04.phpt:1.3 Fri Sep 23 10:28:23 2005
+++ ZendEngine2/tests/error_reporting04.phpt Sat Feb 23 17:03:52 2008
@@ -19,5 +19,5 @@
?>
--EXPECTF--
Notice: Undefined variable: undef in %s on line %d
-int(8191)
+int(16383)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting05.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/error_reporting05.phpt
diff -u ZendEngine2/tests/error_reporting05.phpt:1.4
ZendEngine2/tests/error_reporting05.phpt:1.5
--- ZendEngine2/tests/error_reporting05.phpt:1.4 Thu Mar 16 12:12:31 2006
+++ ZendEngine2/tests/error_reporting05.phpt Sat Feb 23 17:03:52 2008
@@ -30,5 +30,5 @@
Notice: Undefined variable: undef_value in %s on line %d
Notice: Undefined variable: undef_name in %s on line %d
-int(6143)
+int(14335)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting06.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/error_reporting06.phpt
diff -u ZendEngine2/tests/error_reporting06.phpt:1.4
ZendEngine2/tests/error_reporting06.phpt:1.5
--- ZendEngine2/tests/error_reporting06.phpt:1.4 Thu Mar 16 12:12:31 2006
+++ ZendEngine2/tests/error_reporting06.phpt Sat Feb 23 17:03:52 2008
@@ -26,5 +26,5 @@
echo "Done\n";
?>
--EXPECTF--
-int(6143)
+int(14335)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting07.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/error_reporting07.phpt
diff -u ZendEngine2/tests/error_reporting07.phpt:1.4
ZendEngine2/tests/error_reporting07.phpt:1.5
--- ZendEngine2/tests/error_reporting07.phpt:1.4 Thu Mar 16 12:12:31 2006
+++ ZendEngine2/tests/error_reporting07.phpt Sat Feb 23 17:03:52 2008
@@ -26,5 +26,5 @@
echo "Done\n";
?>
--EXPECTF--
-int(6143)
+int(14335)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting08.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/error_reporting08.phpt
diff -u ZendEngine2/tests/error_reporting08.phpt:1.3
ZendEngine2/tests/error_reporting08.phpt:1.4
--- ZendEngine2/tests/error_reporting08.phpt:1.3 Fri Sep 23 10:28:23 2005
+++ ZendEngine2/tests/error_reporting08.phpt Sat Feb 23 17:03:52 2008
@@ -28,5 +28,5 @@
?>
--EXPECTF--
Notice: Undefined variable: undef3 in %s on line %d
-int(8191)
+int(16383)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting09.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/error_reporting09.phpt
diff -u ZendEngine2/tests/error_reporting09.phpt:1.3
ZendEngine2/tests/error_reporting09.phpt:1.4
--- ZendEngine2/tests/error_reporting09.phpt:1.3 Fri Sep 23 10:28:23 2005
+++ ZendEngine2/tests/error_reporting09.phpt Sat Feb 23 17:03:52 2008
@@ -27,5 +27,5 @@
Notice: Undefined variable: blah in %s on line %d
Notice: Undefined variable: undef2 in %s on line %d
-int(8191)
+int(16383)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/error_reporting10.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/error_reporting10.phpt
diff -u ZendEngine2/tests/error_reporting10.phpt:1.4
ZendEngine2/tests/error_reporting10.phpt:1.5
--- ZendEngine2/tests/error_reporting10.phpt:1.4 Thu Mar 16 12:12:31 2006
+++ ZendEngine2/tests/error_reporting10.phpt Sat Feb 23 17:03:52 2008
@@ -30,6 +30,6 @@
echo "Done\n";
?>
--EXPECTF--
-int(6143)
-int(6135)
+int(14335)
+int(14327)
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/is_a.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/is_a.phpt
diff -u ZendEngine2/tests/is_a.phpt:1.3 ZendEngine2/tests/is_a.phpt:1.4
--- ZendEngine2/tests/is_a.phpt:1.3 Wed Aug 22 13:20:09 2007
+++ ZendEngine2/tests/is_a.phpt Sat Feb 23 17:03:52 2008
@@ -1,7 +1,7 @@
--TEST--
is_a() and is_subclass_of() shouldn't call __autoload
--INI--
-error_reporting=4095
+error_reporting=14335
--FILE--
<?php
function __autoload($name) {
@@ -31,16 +31,16 @@
var_dump(is_subclass_of("X1", "X2"));
?>
--EXPECTF--
-Strict Standards: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 17
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 17
bool(false)
-Strict Standards: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 18
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 18
bool(true)
-Strict Standards: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 19
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 19
bool(true)
-Strict Standards: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 20
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in
%sis_a.php on line 20
bool(true)
bool(false)
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.165&r2=1.166&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.165 php-src/ext/date/php_date.c:1.166
--- php-src/ext/date/php_date.c:1.165 Wed Feb 13 21:53:01 2008
+++ php-src/ext/date/php_date.c Sat Feb 23 17:03:53 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.165 2008/02/13 21:53:01 derick Exp $ */
+/* $Id: php_date.c,v 1.166 2008/02/23 17:03:53 helly Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1360,7 +1360,7 @@
}
/* Support for the deprecated is_dst parameter */
if (dst != -1) {
- php_error_docref(NULL TSRMLS_CC, E_STRICT, "The is_dst
parameter is deprecated");
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The is_dst
parameter is deprecated");
if (gmt) {
/* GMT never uses DST */
if (dst == 1) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.251&r2=1.252&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.251 php-src/ext/mysql/php_mysql.c:1.252
--- php-src/ext/mysql/php_mysql.c:1.251 Tue Feb 12 20:43:28 2008
+++ php-src/ext/mysql/php_mysql.c Sat Feb 23 17:03:53 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.251 2008/02/12 20:43:28 johannes Exp $ */
+/* $Id: php_mysql.c,v 1.252 2008/02/23 17:03:53 helly Exp $ */
/* TODO:
*
@@ -1486,7 +1486,7 @@
/* FIXME: Unicode support??? */
if (MySG(trace_mode) ||
!strcasecmp(get_active_function_name(TSRMLS_C).s, "mysql")) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is
deprecated; use mysql_query() instead");
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "use
mysql_query() instead");
}
php_mysql_do_query_general(query, &mysql_link, id, db,
MYSQL_STORE_RESULT, return_value TSRMLS_CC);
@@ -1772,7 +1772,7 @@
RETVAL_UTF8_STRINGL(new_str, new_str_len, ZSTR_DUPLICATE);
efree(new_str);
if (MySG(trace_mode)){
- php_error_docref("function.mysql-real-escape-string" TSRMLS_CC,
E_WARNING, "This function is deprecated; use mysql_real_escape_string()
instead.");
+ php_error_docref("function.mysql-real-escape-string" TSRMLS_CC,
E_DEPRECATED, "use mysql_real_escape_string() instead.");
}
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.123&r2=1.124&diff_format=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.123 php-src/ext/standard/dl.c:1.124
--- php-src/ext/standard/dl.c:1.123 Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/dl.c Sat Feb 23 17:03:53 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dl.c,v 1.123 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: dl.c,v 1.124 2008/02/23 17:03:53 helly Exp $ */
#include "php.h"
#include "dl.h"
@@ -65,6 +65,18 @@
RETURN_FALSE;
}
+ if ((strncmp(sapi_module.name, "cgi", 3) != 0) &&
+ (strcmp(sapi_module.name, "cli") != 0) &&
+ (strncmp(sapi_module.name, "embed", 5) != 0)
+ ) {
+#ifdef ZTS
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in
multithreaded Web servers - use extension=%s in your php.ini",
Z_STRVAL_P(filename));
+ RETURN_FALSE;
+#else
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "dl() is
deprecated - use extension=%s in your php.ini", Z_STRVAL_P(filename));
+#endif
+ }
+
php_dl(filename, MODULE_TEMPORARY, return_value, 0 TSRMLS_CC);
EG(full_tables_cleanup) = 1;
}
@@ -242,7 +254,7 @@
/* Load extension */
if (php_load_extension(filename, type, start_now TSRMLS_CC) == FAILURE)
{
- RETVAL_FALSE;
+ RETVAL_FALSE;
} else {
RETVAL_TRUE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.511&r2=1.512&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.511 php-src/ext/standard/file.c:1.512
--- php-src/ext/standard/file.c:1.511 Tue Feb 12 01:30:58 2008
+++ php-src/ext/standard/file.c Sat Feb 23 17:03:53 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.511 2008/02/12 01:30:58 stas Exp $ */
+/* $Id: file.c,v 1.512 2008/02/23 17:03:53 helly Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1493,6 +1493,7 @@
{
int ret;
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is
deprecated; use php_stream_mkdir() instead.");
if (php_check_open_basedir(dir TSRMLS_CC)) {
return -1;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.668&r2=1.669&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.668 php-src/ext/standard/string.c:1.669
--- php-src/ext/standard/string.c:1.668 Wed Feb 13 16:59:56 2008
+++ php-src/ext/standard/string.c Sat Feb 23 17:03:53 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.668 2008/02/13 16:59:56 colder Exp $ */
+/* $Id: string.c,v 1.669 2008/02/23 17:03:53 helly Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -6158,7 +6158,7 @@
cat = Z_LVAL_PP(pcategory);
} else { /* FIXME: The following behaviour should be removed. */
char *category;
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale
category name as string is deprecated. Use the LC_* -constants instead");
+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "Passing locale
category name as string is deprecated. Use the LC_* -constants instead");
convert_to_string_ex(pcategory);
category = Z_STRVAL_P(*pcategory);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug31402.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/serialize/bug31402.phpt
diff -u php-src/ext/standard/tests/serialize/bug31402.phpt:1.4
php-src/ext/standard/tests/serialize/bug31402.phpt:1.5
--- php-src/ext/standard/tests/serialize/bug31402.phpt:1.4 Mon Mar 27
13:37:47 2006
+++ php-src/ext/standard/tests/serialize/bug31402.phpt Sat Feb 23 17:03:53 2008
@@ -1,7 +1,7 @@
--TEST--
Bug #31402 (unserialize() generates references when it should not)
--INI--
-error_reporting=E_ALL&~E_STRICT
+error_reporting=E_ALL&~E_STRICT&~E_DEPRECATED
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.759&r2=1.760&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.759 php-src/main/main.c:1.760
--- php-src/main/main.c:1.759 Sat Feb 16 02:28:11 2008
+++ php-src/main/main.c Sat Feb 23 17:03:53 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.759 2008/02/16 02:28:11 felipe Exp $ */
+/* $Id: main.c,v 1.760 2008/02/23 17:03:53 helly Exp $ */
/* {{{ includes
*/
@@ -944,6 +944,7 @@
/* fatal errors are real errors and cannot be
made exceptions */
break;
case E_STRICT:
+ case E_DEPRECATED:
/* for the sake of BC to old damaged code */
break;
case E_NOTICE:
@@ -993,6 +994,9 @@
case E_STRICT:
error_type_str = "Strict Standards";
break;
+ case E_DEPRECATED:
+ error_type_str = "Deprecated";
+ break;
default:
error_type_str = "Unknown error";
break;
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/new_001.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/tests/classes/new_001.phpt
diff -u php-src/tests/classes/new_001.phpt:1.2
php-src/tests/classes/new_001.phpt:1.3
--- php-src/tests/classes/new_001.phpt:1.2 Wed Jan 30 14:29:19 2008
+++ php-src/tests/classes/new_001.phpt Sat Feb 23 17:03:53 2008
@@ -1,5 +1,7 @@
--TEST--
Confirm difference between assigning new directly and by reference.
+--INI--
+error_reporting=E_ALL | E_DEPRECATED
--FILE--
<?php
echo "Compile-time strict error message should precede this.\n";
@@ -27,7 +29,7 @@
var_dump($f);
?>
--EXPECTF--
-Strict Standards: Assigning the return value of new by reference is deprecated
in %s on line 23
+Deprecated: Assigning the return value of new by reference is deprecated in %s
on line 23
Compile-time strict error message should precede this.
$f initially points to the first object:
object(Inc)#%d (1) {
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug20175.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/tests/lang/bug20175.phpt
diff -u php-src/tests/lang/bug20175.phpt:1.9
php-src/tests/lang/bug20175.phpt:1.10
--- php-src/tests/lang/bug20175.phpt:1.9 Thu Sep 13 19:31:08 2007
+++ php-src/tests/lang/bug20175.phpt Sat Feb 23 17:03:53 2008
@@ -3,7 +3,7 @@
--SKIPIF--
<?php if (version_compare(zend_version(),'2.0.0-dev','<')) die('skip ZE1 does
not have static class members'); ?>
--INI--
-error_reporting=4095
+error_reporting=E_ALL | E_STRICT | E_DEPRECATED
--FILE--
<?php
print zend_version()."\n";
@@ -139,7 +139,7 @@
print $oop_tester->oop_static()."\n";
?>
--EXPECTF--
-Strict Standards: Assigning the return value of new by reference is deprecated
in %s.php on line %d
+Deprecated: Assigning the return value of new by reference is deprecated in
%s.php on line %d
%s
foo_static()
foo_global()
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug22231.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/tests/lang/bug22231.phpt
diff -u php-src/tests/lang/bug22231.phpt:1.6
php-src/tests/lang/bug22231.phpt:1.7
--- php-src/tests/lang/bug22231.phpt:1.6 Mon Aug 15 14:37:54 2005
+++ php-src/tests/lang/bug22231.phpt Sat Feb 23 17:03:53 2008
@@ -1,7 +1,7 @@
--TEST--
Bug #22231 (segfault when returning a global variable by reference)
--INI--
-error_reporting=4095
+error_reporting=E_ALL | E_DEPRECATED
--FILE--
<?php
class foo {
@@ -27,7 +27,7 @@
var_dump($foo->fubar);
?>
--EXPECTF--
-Strict Standards: Assigning the return value of new by reference is deprecated
in %s on line %d
+Deprecated: Assigning the return value of new by reference is deprecated in %s
on line %d
object(foo)#%d (1) {
["fubar"]=>
string(5) "fubar"
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug22510.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/tests/lang/bug22510.phpt
diff -u php-src/tests/lang/bug22510.phpt:1.8
php-src/tests/lang/bug22510.phpt:1.9
--- php-src/tests/lang/bug22510.phpt:1.8 Tue Jul 12 11:20:05 2005
+++ php-src/tests/lang/bug22510.phpt Sat Feb 23 17:03:53 2008
@@ -1,7 +1,7 @@
--TEST--
Bug #22510 (segfault among complex references)
--INI--
-error_reporting=4095
+error_reporting=E_ALL | E_DEPRECATED
--FILE--
<?php
class foo
@@ -91,7 +91,7 @@
print "I'm alive!\n";
?>
--EXPECTF--
-Strict Standards: Assigning the return value of new by reference is deprecated
in %s on line %d
+Deprecated: Assigning the return value of new by reference is deprecated in %s
on line %d
ok1
bar::run1
foo::method1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
