derick Thu Sep 15 12:19:49 2005 EDT
Modified files:
/php-src php.ini-dist php.ini-recommended run-tests.php
/ZendEngine2 zend.c zend_constants.c zend_errors.h zend_execute.c
/ZendEngine2/tests array_type_hint_001.phpt bug33996.phpt
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/session session.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests 012.phpt
/php-src/ext/spl/tests array_013.phpt
/php-src/main main.c
/php-src/tests/classes array_access_003.phpt private_003.phpt
type_hinting_001.phpt
/php-src/tests/lang bug24658.phpt type_hints_001.phpt
/php-src/tests/run-test test005.phpt test008a.phpt
Log:
- Add E_RECOVERABLE.
#- Thought I did this before already actually...
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.233&r2=1.234&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.233 php-src/php.ini-dist:1.234
--- php-src/php.ini-dist:1.233 Mon Aug 29 10:46:00 2005
+++ php-src/php.ini-dist Thu Sep 15 12:19:37 2005
@@ -254,6 +254,7 @@
; reporting level
; E_ALL - All errors and warnings (doesn't include E_STRICT)
; E_ERROR - fatal run-time errors
+; E_RECOVERABLE_ERROR - almost fatal run-time errors
; E_WARNING - run-time warnings (non-fatal errors)
; E_PARSE - compile-time parse errors
; E_NOTICE - run-time notices (these are warnings which often result
@@ -285,7 +286,7 @@
;
; - Show only errors
;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
;
; - Show all errors except for notices and coding standards warnings
;
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.181&r2=1.182&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.181 php-src/php.ini-recommended:1.182
--- php-src/php.ini-recommended:1.181 Mon Aug 29 10:46:00 2005
+++ php-src/php.ini-recommended Thu Sep 15 12:19:37 2005
@@ -312,6 +312,7 @@
; reporting level
; E_ALL - All errors and warnings (doesn't include E_STRICT)
; E_ERROR - fatal run-time errors
+; E_RECOVERABLE_ERROR - almost fatal run-time errors
; E_WARNING - run-time warnings (non-fatal errors)
; E_PARSE - compile-time parse errors
; E_NOTICE - run-time notices (these are warnings which often result
@@ -343,7 +344,7 @@
;
; - Show only errors
;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
;
; - Show all errors, except coding standards warnings
;
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.230&r2=1.231&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.230 php-src/run-tests.php:1.231
--- php-src/run-tests.php:1.230 Mon Aug 15 18:34:37 2005
+++ php-src/run-tests.php Thu Sep 15 12:19:37 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.230 2005/08/15 22:34:37 sniper Exp $ */
+/* $Id: run-tests.php,v 1.231 2005/09/15 16:19:37 derick Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -143,7 +143,7 @@
'safe_mode=0',
'disable_functions=',
'output_buffering=Off',
- 'error_reporting=4095',
+ 'error_reporting=8191',
'display_errors=1',
'log_errors=0',
'html_errors=0',
http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.322&r2=1.323&ty=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.322 ZendEngine2/zend.c:1.323
--- ZendEngine2/zend.c:1.322 Fri Sep 9 04:19:56 2005
+++ ZendEngine2/zend.c Thu Sep 15 12:19:41 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.322 2005/09/09 08:19:56 dmitry Exp $ */
+/* $Id: zend.c,v 1.323 2005/09/15 16:19:41 derick Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -1672,6 +1672,7 @@
case E_USER_ERROR:
case E_USER_WARNING:
case E_USER_NOTICE:
+ case E_RECOVERABLE_ERROR:
if (zend_is_compiling(TSRMLS_C)) {
error_filename =
zend_get_compiled_filename(TSRMLS_C);
error_lineno =
zend_get_compiled_lineno(TSRMLS_C);
http://cvs.php.net/diff.php/ZendEngine2/zend_constants.c?r1=1.74&r2=1.75&ty=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.74 ZendEngine2/zend_constants.c:1.75
--- ZendEngine2/zend_constants.c:1.74 Thu Sep 8 07:10:28 2005
+++ ZendEngine2/zend_constants.c Thu Sep 15 12:19:41 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_constants.c,v 1.74 2005/09/08 11:10:28 dmitry Exp $ */
+/* $Id: zend_constants.c,v 1.75 2005/09/15 16:19:41 derick Exp $ */
#include "zend.h"
#include "zend_constants.h"
@@ -94,6 +94,7 @@
void zend_register_standard_constants(TSRMLS_D)
{
REGISTER_MAIN_LONG_CONSTANT("E_ERROR", E_ERROR, CONST_PERSISTENT |
CONST_CS);
+ REGISTER_MAIN_LONG_CONSTANT("E_RECOVERABLE_ERROR", E_RECOVERABLE_ERROR,
CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_WARNING", E_WARNING, CONST_PERSISTENT |
CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT |
CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT |
CONST_CS);
http://cvs.php.net/diff.php/ZendEngine2/zend_errors.h?r1=1.18&r2=1.19&ty=u
Index: ZendEngine2/zend_errors.h
diff -u ZendEngine2/zend_errors.h:1.18 ZendEngine2/zend_errors.h:1.19
--- ZendEngine2/zend_errors.h:1.18 Wed Aug 3 09:30:49 2005
+++ ZendEngine2/zend_errors.h Thu Sep 15 12:19:41 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_errors.h,v 1.18 2005/08/03 13:30:49 sniper Exp $ */
+/* $Id: zend_errors.h,v 1.19 2005/09/15 16:19:41 derick Exp $ */
#ifndef ZEND_ERRORS_H
#define ZEND_ERRORS_H
@@ -34,8 +34,9 @@
#define E_USER_WARNING (1<<9L)
#define E_USER_NOTICE (1<<10L)
#define E_STRICT (1<<11L)
+#define E_RECOVERABLE_ERROR (1<<12L)
-#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)
+#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_RECOVERABLE_ERROR)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
#endif /* ZEND_ERRORS_H */
http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.721&r2=1.722&ty=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.721 ZendEngine2/zend_execute.c:1.722
--- ZendEngine2/zend_execute.c:1.721 Thu Sep 15 09:20:24 2005
+++ ZendEngine2/zend_execute.c Thu Sep 15 12:19:41 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.721 2005/09/15 13:20:24 sniper Exp $ */
+/* $Id: zend_execute.c,v 1.722 2005/09/15 16:19:41 derick Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -487,18 +487,18 @@
if (cur_arg_info->class_name) {
if (!arg) {
if (ptr && ptr->op_array) {
- zend_error_noreturn(E_ERROR, "Argument %d
passed to %s%s%s() must be an object of class %v, called in %s on line %d and
defined", arg_num, fclass, fsep, fname, cur_arg_info->class_name,
ptr->op_array->filename, ptr->opline->lineno);
+ zend_error(E_RECOVERABLE_ERROR, "Argument %d
passed to %s%s%s() must be an object of class %v, called in %s on line %d and
defined", arg_num, fclass, fsep, fname, cur_arg_info->class_name,
ptr->op_array->filename, ptr->opline->lineno);
} else {
- zend_error_noreturn(E_ERROR, "Argument %d
passed to %s%s%s() must be an object of class %v", arg_num, fclass, fsep,
fname, cur_arg_info->class_name);
+ zend_error(E_RECOVERABLE_ERROR, "Argument %d
passed to %s%s%s() must be an object of class %v", arg_num, fclass, fsep,
fname, cur_arg_info->class_name);
}
}
switch (Z_TYPE_P(arg)) {
case IS_NULL:
if (!cur_arg_info->allow_null) {
if (ptr && ptr->op_array) {
- zend_error_noreturn(E_ERROR,
"Argument %d passed to %s%s%s() must not be null, called in %s on line %d and
defined", arg_num, fclass, fsep, fname, ptr->op_array->filename,
ptr->opline->lineno);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must not be null, called in %s on line %d and
defined", arg_num, fclass, fsep, fname, ptr->op_array->filename,
ptr->opline->lineno);
} else {
- zend_error_noreturn(E_ERROR,
"Argument %d passed to %s%s%s() must not be null", arg_num, fclass, fsep,
fname);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must not be null", arg_num, fclass, fsep,
fname);
}
}
break;
@@ -513,36 +513,36 @@
error_msg = "be an
instance of";
}
if (ptr && ptr->op_array) {
-
zend_error_noreturn(E_ERROR, "Argument %d passed to %s%s%s() must %s %v, called
in %s on line %d and defined", arg_num, fclass, fsep, fname, error_msg,
ce->name, ptr->op_array->filename, ptr->opline->lineno);
+
zend_error(E_RECOVERABLE_ERROR, "Argument %d passed to %s%s%s() must %s %v,
called in %s on line %d and defined", arg_num, fclass, fsep, fname, error_msg,
ce->name, ptr->op_array->filename, ptr->opline->lineno);
} else {
-
zend_error_noreturn(E_ERROR, "Argument %d passed to %s%s%s() must %s %v",
arg_num, fclass, fsep, fname, error_msg, ce->name);
+
zend_error(E_RECOVERABLE_ERROR, "Argument %d passed to %s%s%s() must %s %v",
arg_num, fclass, fsep, fname, error_msg, ce->name);
}
}
}
break;
default:
if (ptr && ptr->op_array) {
- zend_error_noreturn(E_ERROR, "Argument
%d passed to %s%s%s() must be an object of class %v, called in %s on line %d
and defined", arg_num, fclass, fsep, fname, cur_arg_info->class_name,
ptr->op_array->filename, ptr->opline->lineno);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must be an object of class %v, called in %s on
line %d and defined", arg_num, fclass, fsep, fname, cur_arg_info->class_name,
ptr->op_array->filename, ptr->opline->lineno);
} else {
- zend_error_noreturn(E_ERROR, "Argument
%d passed to %s%s%s() must be an object of class %v", arg_num, fclass, fsep,
fname, cur_arg_info->class_name);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must be an object of class %v", arg_num,
fclass, fsep, fname, cur_arg_info->class_name);
}
break;
}
} else if (cur_arg_info->array_type_hint) {
if (!arg) {
if (ptr && ptr->op_array) {
- zend_error_noreturn(E_ERROR, "Argument %d
passed to %s%s%s() must be an array, called in %s on line %d and defined",
arg_num, fclass, fsep, fname, ptr->op_array->filename, ptr->opline->lineno);
+ zend_error(E_RECOVERABLE_ERROR, "Argument %d
passed to %s%s%s() must be an array, called in %s on line %d and defined",
arg_num, fclass, fsep, fname, ptr->op_array->filename, ptr->opline->lineno);
} else {
- zend_error_noreturn(E_ERROR, "Argument %d
passed to %s%s%s() must be an array", arg_num, fclass, fsep, fname);
+ zend_error(E_RECOVERABLE_ERROR, "Argument %d
passed to %s%s%s() must be an array", arg_num, fclass, fsep, fname);
}
}
switch (Z_TYPE_P(arg)) {
case IS_NULL:
if (!cur_arg_info->allow_null) {
if (ptr && ptr->op_array) {
- zend_error_noreturn(E_ERROR,
"Argument %d passed to %s%s%s() must not be null, called in %s on line %d and
defined", arg_num, fclass, fsep, fname, ptr->op_array->filename,
ptr->opline->lineno);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must not be null, called in %s on line %d and
defined", arg_num, fclass, fsep, fname, ptr->op_array->filename,
ptr->opline->lineno);
} else {
- zend_error_noreturn(E_ERROR,
"Argument %d passed to %s%s%s() must not be null", arg_num, fclass, fsep,
fname);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must not be null", arg_num, fclass, fsep,
fname);
}
}
break;
@@ -550,9 +550,9 @@
break;
default:
if (ptr && ptr->op_array) {
- zend_error_noreturn(E_ERROR, "Argument
%d passed to %s%s%s() must be an array, called in %s on line %d and defined",
arg_num, fclass, fsep, fname, ptr->op_array->filename, ptr->opline->lineno);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must be an array, called in %s on line %d and
defined", arg_num, fclass, fsep, fname, ptr->op_array->filename,
ptr->opline->lineno);
} else {
- zend_error_noreturn(E_ERROR, "Argument
%d passed to %s%s%s() must be an array", arg_num, fclass, fsep, fname);
+ zend_error(E_RECOVERABLE_ERROR,
"Argument %d passed to %s%s%s() must be an array", arg_num, fclass, fsep,
fname);
}
break;
}
http://cvs.php.net/diff.php/ZendEngine2/tests/array_type_hint_001.phpt?r1=1.2&r2=1.3&ty=u
Index: ZendEngine2/tests/array_type_hint_001.phpt
diff -u ZendEngine2/tests/array_type_hint_001.phpt:1.2
ZendEngine2/tests/array_type_hint_001.phpt:1.3
--- ZendEngine2/tests/array_type_hint_001.phpt:1.2 Fri Aug 5 05:34:28 2005
+++ ZendEngine2/tests/array_type_hint_001.phpt Thu Sep 15 12:19:43 2005
@@ -1,15 +1,15 @@
---TEST--
-Array type hint
---FILE--
-<?php
-function foo(array $a) {
- echo count($a)."\n";
-}
-
-foo(array(1,2,3));
-foo(123);
-?>
---EXPECTF--
-3
-
-Fatal error: Argument 1 must be an array, called in %sarray_type_hint_001.php
on line 7 and defined in %sarray_type_hint_001.php on line 2
+--TEST--
+Array type hint
+--FILE--
+<?php
+function foo(array $a) {
+ echo count($a)."\n";
+}
+
+foo(array(1,2,3));
+foo(123);
+?>
+--EXPECTF--
+3
+
+Catchable fatal error: Argument 1 must be an array, called in
%sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on
line 2
http://cvs.php.net/diff.php/ZendEngine2/tests/bug33996.phpt?r1=1.1&r2=1.2&ty=u
Index: ZendEngine2/tests/bug33996.phpt
diff -u ZendEngine2/tests/bug33996.phpt:1.1 ZendEngine2/tests/bug33996.phpt:1.2
--- ZendEngine2/tests/bug33996.phpt:1.1 Fri Aug 5 05:34:28 2005
+++ ZendEngine2/tests/bug33996.phpt Thu Sep 15 12:19:43 2005
@@ -26,4 +26,4 @@
--EXPECTF--
Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line
17 and defined in %sbug33996.php on line 12
Hi!
-Fatal error: Argument 1 must be an object of class Foo, called in
%sbug33996.php on line 18 and defined in %sbug33996.php on line 7
+Catchable fatal error: Argument 1 must be an object of class Foo, called in
%sbug33996.php on line 18 and defined in %sbug33996.php on line 7
http://cvs.php.net/diff.php/php-src/ext/mcrypt/mcrypt.c?r1=1.91&r2=1.92&ty=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91 php-src/ext/mcrypt/mcrypt.c:1.92
--- php-src/ext/mcrypt/mcrypt.c:1.91 Wed Aug 3 10:07:24 2005
+++ php-src/ext/mcrypt/mcrypt.c Thu Sep 15 12:19:43 2005
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.91 2005/08/03 14:07:24 sniper Exp $ */
+/* $Id: mcrypt.c,v 1.92 2005/09/15 16:19:43 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1075,7 +1075,8 @@
}
if (mcrypt_generic_init(td, key_s, use_key_length, iv_s) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Mcrypt
initialisation failed");
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Mcrypt
initialisation failed");
+ RETURN_FALSE;
}
if (dencrypt == MCRYPT_ENCRYPT) {
mcrypt_generic(td, data_s, data_size);
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.418&r2=1.419&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.418 php-src/ext/session/session.c:1.419
--- php-src/ext/session/session.c:1.418 Mon Aug 22 08:22:12 2005
+++ php-src/ext/session/session.c Thu Sep 15 12:19:44 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.418 2005/08/22 12:22:12 dmitry Exp $ */
+/* $Id: session.c,v 1.419 2005/09/15 16:19:44 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -100,6 +100,7 @@
if (PG(modules_activated) && !PS(mod)) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot find save
handler %s", new_value);
+ return FAILURE;
}
return SUCCESS;
@@ -126,6 +127,7 @@
if (PG(modules_activated) && !PS(serializer)) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot find
serialization handler %s", new_value);
+ return FAILURE;
}
return SUCCESS;
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.159&r2=1.160&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.159
php-src/ext/simplexml/simplexml.c:1.160
--- php-src/ext/simplexml/simplexml.c:1.159 Wed Aug 31 13:00:22 2005
+++ php-src/ext/simplexml/simplexml.c Thu Sep 15 12:19:45 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.159 2005/08/31 17:00:22 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.160 2005/09/15 16:19:45 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1093,6 +1093,7 @@
if (sxe_object_cast(z, retval, IS_STRING, 0 TSRMLS_CC)==FAILURE) {
zend_error(E_ERROR, "Unable to cast node to string");
+ /* FIXME: Should not be fatal */
}
retval->refcount = 0;
@@ -1152,6 +1153,7 @@
{
php_error(E_ERROR, "Cannot clone object of class %v due to
'zend.ze1_compatibility_mode'", Z_OBJCE_P(zobject)->name);
/* Return zobject->value.obj just to satisfy compiler */
+ /* FIXME: Should not be a fatal */
return zobject->value.obj;
}
@@ -1767,7 +1769,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.159 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.160 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/012.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/012.phpt
diff -u php-src/ext/simplexml/tests/012.phpt:1.3
php-src/ext/simplexml/tests/012.phpt:1.4
--- php-src/ext/simplexml/tests/012.phpt:1.3 Sat Jan 17 14:41:32 2004
+++ php-src/ext/simplexml/tests/012.phpt Thu Sep 15 12:19:45 2005
@@ -36,4 +36,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<foo attr="new value"/>
-Fatal error: main(): Cannot create unnamed attribute in %s012.php on line %d
+Catchable fatal error: main(): Cannot create unnamed attribute in %s012.php on
line %d
http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_013.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/array_013.phpt
diff -u php-src/ext/spl/tests/array_013.phpt:1.1
php-src/ext/spl/tests/array_013.phpt:1.2
--- php-src/ext/spl/tests/array_013.phpt:1.1 Thu Apr 29 18:25:45 2004
+++ php-src/ext/spl/tests/array_013.phpt Thu Sep 15 12:19:45 2005
@@ -78,4 +78,4 @@
two=>2
===Append===
-Fatal error: ArrayIterator::append(): Cannot append properties to objects, use
ArrayIterator::offsetSet() instead in %sarray_013.php on line %d
+Catchable fatal error: ArrayIterator::append(): Cannot append properties to
objects, use ArrayIterator::offsetSet() instead in %sarray_013.php on line %d
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.648&r2=1.649&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.648 php-src/main/main.c:1.649
--- php-src/main/main.c:1.648 Fri Sep 2 10:08:09 2005
+++ php-src/main/main.c Thu Sep 15 12:19:46 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.648 2005/09/02 14:08:09 sniper Exp $ */
+/* $Id: main.c,v 1.649 2005/09/15 16:19:46 derick Exp $ */
/* {{{ includes
*/
@@ -805,6 +805,9 @@
case E_USER_ERROR:
error_type_str = "Fatal error";
break;
+ case E_RECOVERABLE_ERROR:
+ error_type_str = "Catchable fatal error";
+ break;
case E_WARNING:
case E_CORE_WARNING:
case E_COMPILE_WARNING:
@@ -886,6 +889,7 @@
}
/* no break - intentionally */
case E_ERROR:
+ case E_RECOVERABLE_ERROR:
/* case E_PARSE: the parser would return 1 (failure), we can
bail out nicely */
case E_COMPILE_ERROR:
case E_USER_ERROR:
http://cvs.php.net/diff.php/php-src/tests/classes/array_access_003.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/tests/classes/array_access_003.phpt
diff -u php-src/tests/classes/array_access_003.phpt:1.7
php-src/tests/classes/array_access_003.phpt:1.8
--- php-src/tests/classes/array_access_003.phpt:1.7 Mon Aug 15 10:37:54 2005
+++ php-src/tests/classes/array_access_003.phpt Thu Sep 15 12:19:48 2005
@@ -1,7 +1,7 @@
--TEST--
ZE2 ArrayAccess::offsetGet ambiguties
--INI--
-error_reporting=4095
+error_reporting=8191
--FILE--
<?php
class object implements ArrayAccess {
http://cvs.php.net/diff.php/php-src/tests/classes/private_003.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/private_003.phpt
diff -u php-src/tests/classes/private_003.phpt:1.2
php-src/tests/classes/private_003.phpt:1.3
--- php-src/tests/classes/private_003.phpt:1.2 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/private_003.phpt Thu Sep 15 12:19:48 2005
@@ -4,7 +4,6 @@
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip
ZendEngine 2 needed'); ?>
--FILE--
<?php
-ini_set("error_reporting",2039);
class pass {
private static function show() {
echo "Call show()\n";
http://cvs.php.net/diff.php/php-src/tests/classes/type_hinting_001.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/tests/classes/type_hinting_001.phpt
diff -u php-src/tests/classes/type_hinting_001.phpt:1.3
php-src/tests/classes/type_hinting_001.phpt:1.4
--- php-src/tests/classes/type_hinting_001.phpt:1.3 Fri Aug 5 05:35:09 2005
+++ php-src/tests/classes/type_hinting_001.phpt Thu Sep 15 12:19:48 2005
@@ -35,4 +35,4 @@
?>
--EXPECTF--
-Fatal error: Argument 1 must implement interface Foo, called in %s on line 27
and defined in %s on line 12
+Catchable fatal error: Argument 1 must implement interface Foo, called in %s
on line 27 and defined in %s on line 12
http://cvs.php.net/diff.php/php-src/tests/lang/bug24658.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/tests/lang/bug24658.phpt
diff -u php-src/tests/lang/bug24658.phpt:1.3
php-src/tests/lang/bug24658.phpt:1.4
--- php-src/tests/lang/bug24658.phpt:1.3 Sat Aug 16 14:28:20 2003
+++ php-src/tests/lang/bug24658.phpt Thu Sep 15 12:19:48 2005
@@ -53,4 +53,4 @@
object(foo)#%d (0) {
}
-Fatal error: Argument 1 must be an object of class foo in %s on line %d
+Catchable fatal error: Argument 1 must be an object of class foo in %s on line
%d
http://cvs.php.net/diff.php/php-src/tests/lang/type_hints_001.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/tests/lang/type_hints_001.phpt
diff -u php-src/tests/lang/type_hints_001.phpt:1.3
php-src/tests/lang/type_hints_001.phpt:1.4
--- php-src/tests/lang/type_hints_001.phpt:1.3 Fri Aug 5 05:35:09 2005
+++ php-src/tests/lang/type_hints_001.phpt Thu Sep 15 12:19:48 2005
@@ -23,4 +23,4 @@
?>
--EXPECTF--
-Fatal error: Argument 1 must be an instance of Foo, called in %s on line 16
and defined in %s on line 9
+Catchable fatal error: Argument 1 must be an instance of Foo, called in %s on
line 16 and defined in %s on line 9
http://cvs.php.net/diff.php/php-src/tests/run-test/test005.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/tests/run-test/test005.phpt
diff -u php-src/tests/run-test/test005.phpt:1.3
php-src/tests/run-test/test005.phpt:1.4
--- php-src/tests/run-test/test005.phpt:1.3 Sun Nov 30 08:57:20 2003
+++ php-src/tests/run-test/test005.phpt Thu Sep 15 12:19:48 2005
@@ -24,7 +24,7 @@
?>
--EXPECTF--
string(1) "1"
-string(4) "4095"
+string(4) "8191"
string(1) "0"
string(1) "1"
string(1) "0"
http://cvs.php.net/diff.php/php-src/tests/run-test/test008a.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/run-test/test008a.phpt
diff -u php-src/tests/run-test/test008a.phpt:1.2
php-src/tests/run-test/test008a.phpt:1.3
--- php-src/tests/run-test/test008a.phpt:1.2 Sun Nov 30 08:57:20 2003
+++ php-src/tests/run-test/test008a.phpt Thu Sep 15 12:19:48 2005
@@ -24,7 +24,7 @@
?>
--EXPECTF--
string(1) "1"
-string(4) "4095"
+string(4) "8191"
string(1) "0"
string(1) "1"
string(1) "0"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
