archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Errors converted to exceptions are not "recoverable" anymore.

Browse source
This commit is contained in:
Dmitry Stogov 2015-03-10 10:31:55 +03:00
parent 56eed39e04
commit a30d328671
106 changed files with 163 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/tests/array_type_hint_001.phpt
View file

@ -12,4 +12,4 @@ foo(123);
--EXPECTF--
3
Catchable fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
Fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2

2
Zend/tests/bug33996.phpt
View file

@ -26,4 +26,4 @@ FooTest(new Foo());
--EXPECTF--
Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
Hi!
Catchable fatal error: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
Fatal error: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d

2
Zend/tests/bug39003.phpt
View file

@ -21,4 +21,4 @@ test($obj);
echo "Done\n";
?>
--EXPECTF--
Catchable fatal error: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s on line %d
Fatal error: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s on line %d

2
Zend/tests/bug42802.phpt
View file

@ -37,4 +37,4 @@ ok
ok
ok
Catchable fatal error: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php on line %d
Fatal error: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php on line %d

2
Zend/tests/bug43332_1.phpt
View file

@ -12,4 +12,4 @@ $foo = new foo;
$foo->bar($foo); // Ok!
$foo->bar(new \stdclass); // Error, ok!
--EXPECTF--
Catchable fatal error: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php on line 5
Fatal error: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php on line 5

2
Zend/tests/bug50146.phpt
View file

@ -17,4 +17,4 @@ var_dump(isset($obj->a));
bool(false)
bool(false)
Catchable fatal error: Closure object cannot have properties in %s on line %d
Fatal error: Closure object cannot have properties in %s on line %d

2
Zend/tests/bug55705.phpt
View file

@ -6,4 +6,4 @@ function f(callable $c) {}
f();
?>
--EXPECTF--
Catchable fatal error: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s on line %d
Fatal error: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s on line %d

2
Zend/tests/bug68446.phpt
View file

@ -32,5 +32,5 @@ array(1) {
int(1)
}
Catchable fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d
Fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d

2
Zend/tests/closure_022.phpt
View file

@ -8,5 +8,5 @@ $foo = function() use ($a) {
$foo->a = 1;
?>
--EXPECTF--
Catchable fatal error: Closure object cannot have properties in %sclosure_022.php on line 5
Fatal error: Closure object cannot have properties in %sclosure_022.php on line 5

2
Zend/tests/closure_027.phpt
View file

@ -28,4 +28,4 @@ Notice: Undefined variable: y in %s on line %d
Warning: Missing argument 1 for {closure}(), called in %s on line %d and defined in %s on line %d
NULL
Catchable fatal error: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s on line %d
Fatal error: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s on line %d

2
Zend/tests/dereference_002.phpt
View file

@ -76,4 +76,4 @@ NULL
Notice: Undefined offset: 3 in %s on line %d
Catchable fatal error: Call to a member function bar() on null in %s on line %d
Fatal error: Call to a member function bar() on null in %s on line %d

2
Zend/tests/generators/errors/generator_instantiate_error.phpt
View file

@ -7,4 +7,4 @@ new Generator;
?>
--EXPECTF--
Catchable fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %s on line %d
Fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %s on line %d

2
Zend/tests/methods-on-non-objects-catch.phpt
View file

@ -16,6 +16,6 @@ echo "Alive\n";
?>
--EXPECTF--
int(4096)
int(1)
string(%d) "Call to a member function method() on null"
Alive

8
Zend/tests/methods-on-non-objects-usort.phpt
View file

@ -20,13 +20,13 @@ var_dump($list);
echo "Alive\n";
?>
--EXPECTF--
int(4096)
int(1)
string(43) "Call to a member function compare() on null"
int(4096)
int(1)
string(43) "Call to a member function compare() on null"
int(4096)
int(1)
string(43) "Call to a member function compare() on null"
int(4096)
int(1)
string(43) "Call to a member function compare() on null"
array(5) {
[0]=>

2
Zend/tests/methods-on-non-objects.phpt
View file

@ -9,4 +9,4 @@ echo "Should not get here!\n";
?>
--EXPECTF--
Catchable fatal error: Call to a member function method() on null in %s on line %d
Fatal error: Call to a member function method() on null in %s on line %d

2
Zend/tests/ns_071.phpt
View file

@ -18,4 +18,4 @@ new bar(new \stdclass);
--EXPECTF--
NULL
Catchable fatal error: Argument 1 passed to foo\bar::__construct() must be of the type array, object given, called in %s on line %d and defined in %s on line %d
Fatal error: Argument 1 passed to foo\bar::__construct() must be of the type array, object given, called in %s on line %d and defined in %s on line %d

2
Zend/tests/ns_072.phpt
View file

@ -30,4 +30,4 @@ object(foo\test)#%d (0) {
}
NULL
Catchable fatal error: Argument 1 passed to foo\bar::__construct() must implement interface foo\foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d
Fatal error: Argument 1 passed to foo\bar::__construct() must implement interface foo\foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d

2
Zend/tests/objects_022.phpt
View file

@ -36,4 +36,4 @@ object(bar)#%d (0) {
object(baz)#%d (0) {
}
Catchable fatal error: Argument 1 passed to foo::testFoo() must be an instance of foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d
Fatal error: Argument 1 passed to foo::testFoo() must be an instance of foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d

2
Zend/tests/return_types/001.phpt
View file

@ -9,4 +9,4 @@ function test1() : array {
test1();
--EXPECTF--
Catchable fatal error: Return value of test1() must be of the type array, none returned in %s on line %d
Fatal error: Return value of test1() must be of the type array, none returned in %s on line %d

2
Zend/tests/return_types/002.phpt
View file

@ -10,4 +10,4 @@ function test1() : array {
test1();
--EXPECTF--
Catchable fatal error: Return value of test1() must be of the type array, null returned in %s on line %d
Fatal error: Return value of test1() must be of the type array, null returned in %s on line %d

2
Zend/tests/return_types/003.phpt
View file

@ -9,4 +9,4 @@ function test1() : array {
test1();
--EXPECTF--
Catchable fatal error: Return value of test1() must be of the type array, integer returned in %s on line %d
Fatal error: Return value of test1() must be of the type array, integer returned in %s on line %d

2
Zend/tests/return_types/004.phpt
View file

@ -10,4 +10,4 @@ function test1() : array {
test1();
--EXPECTF--
Catchable fatal error: Return value of test1() must be of the type array, string returned in %s on line %d
Fatal error: Return value of test1() must be of the type array, string returned in %s on line %d

2
Zend/tests/return_types/005.phpt
View file

@ -15,4 +15,4 @@ $qux = new qux();
$qux->foo();
--EXPECTF--
Catchable fatal error: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s on line %d
Fatal error: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s on line %d

2
Zend/tests/return_types/010.phpt
View file

@ -11,4 +11,4 @@ $array = [1, 2, 3];
var_dump(foo($array));
--EXPECTF--
Catchable fatal error: Return value of foo() must be of the type array, null returned in %s on line %d
Fatal error: Return value of foo() must be of the type array, null returned in %s on line %d

2
Zend/tests/return_types/013.phpt
View file

@ -16,4 +16,4 @@ $baz = new foo();
var_dump($func=$baz->bar(), $func());
--EXPECTF--
Catchable fatal error: Return value of foo::{closure}() must be of the type array, null returned in %s on line %d
Fatal error: Return value of foo::{closure}() must be of the type array, null returned in %s on line %d

2
Zend/tests/return_types/rfc001.phpt
View file

@ -11,4 +11,4 @@ function get_config(): array {
get_config();
--EXPECTF--
Catchable fatal error: Return value of get_config() must be of the type array, integer returned in %s on line %d
Fatal error: Return value of get_config() must be of the type array, integer returned in %s on line %d

2
Zend/tests/return_types/rfc002.phpt
View file

@ -10,4 +10,4 @@ function answer(): int {
answer();
--EXPECTF--
Catchable fatal error: Return value of answer() must be an instance of int, integer returned in %s on line %d
Fatal error: Return value of answer() must be an instance of int, integer returned in %s on line %d

2
Zend/tests/return_types/rfc003.phpt
View file

@ -10,4 +10,4 @@ function foo(): DateTime {
foo();
--EXPECTF--
Catchable fatal error: Return value of foo() must be an instance of DateTime, null returned in %s on line %d
Fatal error: Return value of foo() must be an instance of DateTime, null returned in %s on line %d

2
Zend/tests/variadic/typehint_error.phpt
View file

@ -33,4 +33,4 @@ array(3) {
}
}
Catchable fatal error: Argument 3 passed to test() must be of the type array, integer given, called in %s on line %d
Fatal error: Argument 3 passed to test() must be of the type array, integer given, called in %s on line %d

8
Zend/zend_closures.c
View file

@ -32,7 +32,7 @@
#define ZEND_CLOSURE_PRINT_NAME "Closure object"
#define ZEND_CLOSURE_PROPERTY_ERROR() \
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Closure object cannot have properties")
zend_error(E_EXCEPTION | E_ERROR, "Closure object cannot have properties")
typedef struct _zend_closure {
zend_object std;
@ -53,7 +53,7 @@ ZEND_METHOD(Closure, __invoke) /* {{{ */
arguments = emalloc(sizeof(zval) * ZEND_NUM_ARGS());
if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), arguments) == FAILURE) {
efree(arguments);
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Cannot get arguments for calling closure");
zend_error(E_EXCEPTION | E_ERROR, "Cannot get arguments for calling closure");
RETVAL_FALSE;
} else if (call_user_function_ex(CG(function_table), NULL, getThis(), return_value, ZEND_NUM_ARGS(), arguments, 1, NULL) == FAILURE) {
RETVAL_FALSE;
@ -168,7 +168,7 @@ ZEND_METHOD(Closure, bind)
static zend_function *zend_closure_get_constructor(zend_object *object) /* {{{ */
{
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Instantiation of 'Closure' is not allowed");
zend_error(E_EXCEPTION | E_ERROR, "Instantiation of 'Closure' is not allowed");
return NULL;
}
/* }}} */
@ -418,7 +418,7 @@ static HashTable *zend_closure_get_gc(zval *obj, zval **table, int *n) /* {{{ */
Private constructor preventing instantiation */
ZEND_METHOD(Closure, __construct)
{
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Instantiation of 'Closure' is not allowed");
zend_error(E_EXCEPTION | E_ERROR, "Instantiation of 'Closure' is not allowed");
}
/* }}} */

36
Zend/zend_execute.c
View file

@ -636,21 +636,21 @@ static void zend_verify_internal_arg_type(zend_function *zf, uint32_t arg_num, z
if (Z_TYPE_P(arg) == IS_OBJECT) {
need_msg = zend_verify_internal_arg_class_kind((zend_internal_arg_info*)cur_arg_info, &class_name, &ce);
if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce)) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
}
} else if (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null) {
need_msg = zend_verify_internal_arg_class_kind((zend_internal_arg_info*)cur_arg_info, &class_name, &ce);
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
}
} else if (cur_arg_info->type_hint) {
if (cur_arg_info->type_hint == IS_ARRAY) {
ZVAL_DEREF(arg);
if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
}
} else if (cur_arg_info->type_hint == IS_CALLABLE) {
if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
}
#if ZEND_DEBUG
} else {
@ -681,21 +681,21 @@ static void zend_verify_arg_type(zend_function *zf, uint32_t arg_num, zval *arg,
if (Z_TYPE_P(arg) == IS_OBJECT) {
need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name, &ce);
if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce)) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
}
} else if (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value)))) {
need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name, &ce);
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
}
} else if (cur_arg_info->type_hint) {
if (cur_arg_info->type_hint == IS_ARRAY) {
ZVAL_DEREF(arg);
if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value))))) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
}
} else if (cur_arg_info->type_hint == IS_CALLABLE) {
if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value))))) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
}
#if ZEND_DEBUG
} else {
@ -723,13 +723,13 @@ static inline int zend_verify_missing_arg_type(zend_function *zf, uint32_t arg_n
char *class_name;
need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name, &ce);
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "none", "", NULL);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, "none", "", NULL);
return 0;
} else if (cur_arg_info->type_hint) {
if (cur_arg_info->type_hint == IS_ARRAY) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", "none", "", NULL);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be of the type array", "", "none", "", NULL);
} else if (cur_arg_info->type_hint == IS_CALLABLE) {
zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", "none", "", NULL);
zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be callable", "", "none", "", NULL);
#if ZEND_DEBUG
} else {
zend_error(E_ERROR, "Unknown typehint");
@ -831,20 +831,20 @@ static void zend_verify_return_type(zend_function *zf, zval *ret)
if (Z_TYPE_P(ret) == IS_OBJECT) {
need_msg = zend_verify_arg_class_kind(ret_info, &class_name, &ce);
if (!ce || !instanceof_function(Z_OBJCE_P(ret), ce)) {
zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, need_msg, class_name, "instance of ", Z_OBJCE_P(ret)->name->val);
zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, need_msg, class_name, "instance of ", Z_OBJCE_P(ret)->name->val);
}
} else if (Z_TYPE_P(ret) != IS_NULL || !ret_info->allow_null) {
need_msg = zend_verify_arg_class_kind(ret_info, &class_name, &ce);
zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, need_msg, class_name, zend_zval_type_name(ret), "");
zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, need_msg, class_name, zend_zval_type_name(ret), "");
}
} else if (ret_info->type_hint) {
if (ret_info->type_hint == IS_ARRAY) {
if (Z_TYPE_P(ret) != IS_ARRAY && (Z_TYPE_P(ret) != IS_NULL || !ret_info->allow_null)) {
zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be of the type array", "", zend_zval_type_name(ret), "");
zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be of the type array", "", zend_zval_type_name(ret), "");
}
} else if (ret_info->type_hint == IS_CALLABLE) {
if (!zend_is_callable(ret, IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(ret) != IS_NULL || !ret_info->allow_null)) {
zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be callable", "", zend_zval_type_name(ret), "");
zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be callable", "", zend_zval_type_name(ret), "");
}
#if ZEND_DEBUG
} else {
@ -864,13 +864,13 @@ static inline int zend_verify_missing_return_type(zend_function *zf)
char *class_name;
need_msg = zend_verify_arg_class_kind(ret_info, &class_name, &ce);
zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, need_msg, class_name, "none", "");
zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, need_msg, class_name, "none", "");
return 0;
} else if (ret_info->type_hint) {
if (ret_info->type_hint == IS_ARRAY) {
zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be of the type array", "", "none", "");
zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be of the type array", "", "none", "");
} else if (ret_info->type_hint == IS_CALLABLE) {
zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be callable", "", "none", "");
zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be callable", "", "none", "");
#if ZEND_DEBUG
} else {
zend_error(E_ERROR, "Unknown typehint");

2
Zend/zend_generators.c
View file

@ -286,7 +286,7 @@ ZEND_API void zend_generator_create_zval(zend_execute_data *call, zend_op_array
static zend_function *zend_generator_get_constructor(zend_object *object) /* {{{ */
{
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "The \"Generator\" class is reserved for internal use and cannot be manually instantiated");
zend_error(E_EXCEPTION | E_ERROR, "The \"Generator\" class is reserved for internal use and cannot be manually instantiated");
return NULL;
}

6
Zend/zend_vm_def.h
View file

@ -2438,7 +2438,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMPVAR|UNUSED|CV, CONST|TMPVAR|CV)
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
FREE_OP2();
FREE_OP1();
HANDLE_EXCEPTION();
@ -3685,7 +3685,7 @@ ZEND_VM_C_LABEL(send_again):
ZEND_HASH_FOREACH_STR_KEY_VAL(ht, name, arg) {
if (name) {
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Cannot unpack array with string keys");
zend_error(E_EXCEPTION | E_ERROR, "Cannot unpack array with string keys");
FREE_OP1();
HANDLE_EXCEPTION();
}
@ -3758,7 +3758,7 @@ ZEND_VM_C_LABEL(send_again):
}
if (Z_TYPE(key) == IS_STRING) {
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR,
zend_error(E_EXCEPTION | E_ERROR,
"Cannot unpack Traversable with string keys");
zend_string_release(Z_STR(key));
ZEND_VM_C_GOTO(unpack_iter_dtor);

22
Zend/zend_vm_execute.h
View file

@ -905,7 +905,7 @@ send_again:
ZEND_HASH_FOREACH_STR_KEY_VAL(ht, name, arg) {
if (name) {
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Cannot unpack array with string keys");
zend_error(E_EXCEPTION | E_ERROR, "Cannot unpack array with string keys");
FREE_OP(free_op1);
HANDLE_EXCEPTION();
}
@ -978,7 +978,7 @@ send_again:
}
if (Z_TYPE(key) == IS_STRING) {
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR,
zend_error(E_EXCEPTION | E_ERROR,
"Cannot unpack Traversable with string keys");
zend_string_release(Z_STR(key));
goto unpack_iter_dtor;
@ -20403,7 +20403,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
HANDLE_EXCEPTION();
@ -22664,7 +22664,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
HANDLE_EXCEPTION();
@ -24080,7 +24080,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zval_ptr_dtor_nogc(free_op2);
HANDLE_EXCEPTION();
@ -27660,7 +27660,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
HANDLE_EXCEPTION();
@ -32068,7 +32068,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
HANDLE_EXCEPTION();
@ -34115,7 +34115,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCO
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zval_ptr_dtor_nogc(free_op2);
HANDLE_EXCEPTION();
@ -35773,7 +35773,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_CONST_HANDLER(ZEND_O
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zval_ptr_dtor_nogc(free_op1);
HANDLE_EXCEPTION();
@ -37375,7 +37375,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_CV_HANDLER(ZEND_OPCO
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zval_ptr_dtor_nogc(free_op1);
HANDLE_EXCEPTION();
@ -38010,7 +38010,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_TMPVAR_HANDLER(ZEND_
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
zval_ptr_dtor_nogc(free_op2);
zval_ptr_dtor_nogc(free_op1);
HANDLE_EXCEPTION();

2
ext/date/tests/014.phpt
View file

@ -37,4 +37,4 @@ Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on li
bool(false)
int(0)
Catchable fatal error: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s
Fatal error: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s

2
ext/intl/tests/calendar_add_error.phpt
View file

@ -38,4 +38,4 @@ Warning: intlcal_add() expects exactly 3 parameters, 4 given in %s on line %d
Warning: intlcal_add(): intlcal_add: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s on line %d

4
ext/intl/tests/calendar_before_after_error.phpt
View file

@ -67,9 +67,9 @@ bool(false)
error: 2, IntlCalendar::before() expects exactly 1 parameter, 0 given
error: 2, IntlCalendar::before(): intlcal_before/after: bad arguments
bool(false)
error: 4096, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, integer given
error: 4096, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, integer given
error: 2, IntlCalendar::after() expects exactly 1 parameter, 2 given
error: 2, IntlCalendar::after(): intlcal_before/after: bad arguments

2
ext/intl/tests/calendar_clear_error.phpt
View file

@ -28,4 +28,4 @@ bool(false)
Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s on line %d

8
ext/intl/tests/calendar_equals_error.phpt
View file

@ -49,10 +49,10 @@ try {
error: 2, IntlCalendar::equals() expects exactly 1 parameter, 0 given
error: 2, IntlCalendar::equals(): intlcal_equals: bad arguments
bool(false)
error: 4096, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, instance of stdClass given
error: 1, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, instance of stdClass given
error: 4096, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, integer given
error: 4096, Argument 2 passed to intlcal_equals() must be an instance of IntlCalendar, array given
error: 1, Argument 2 passed to intlcal_equals() must be an instance of IntlCalendar, array given
error: 4096, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, integer given

2
ext/intl/tests/calendar_fieldDifference_error.phpt
View file

@ -39,4 +39,4 @@ Warning: intlcal_field_difference() expects exactly 3 parameters, 4 given in %s
Warning: intlcal_field_difference(): intlcal_field_difference: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getDayOfWeekType_error.phpt
View file

@ -41,4 +41,4 @@ Warning: intlcal_get_day_of_week_type() expects parameter 2 to be integer, strin
Warning: intlcal_get_day_of_week_type(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getErrorCode_error.phpt
View file

@ -23,4 +23,4 @@ Warning: IntlCalendar::getErrorCode() expects exactly 0 parameters, 1 given in %
Warning: IntlCalendar::getErrorCode(): intlcal_get_error_code: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s on line %d

2
ext/intl/tests/calendar_getErrorMessage_error.phpt
View file

@ -23,4 +23,4 @@ Warning: IntlCalendar::getErrorMessage() expects exactly 0 parameters, 1 given i
Warning: IntlCalendar::getErrorMessage(): intlcal_get_error_message: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s on line %d

2
ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
View file

@ -29,4 +29,4 @@ Warning: intlcal_get_first_day_of_week() expects exactly 1 parameter, 2 given in
Warning: intlcal_get_first_day_of_week(): intlcal_get_first_day_of_week: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getLocale_error.phpt
View file

@ -39,4 +39,4 @@ Warning: intlcal_get_locale() expects exactly 2 parameters, 1 given in %s on lin
Warning: intlcal_get_locale(): intlcal_get_locale: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
View file

@ -29,4 +29,4 @@ Warning: intlcal_get_minimal_days_in_first_week() expects exactly 1 parameter, 2
Warning: intlcal_get_minimal_days_in_first_week(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
View file

@ -44,4 +44,4 @@ Warning: intlcal_get_repeated_wall_time_option() expects exactly 1 parameter, 2
Warning: intlcal_get_repeated_wall_time_option(): intlcal_get_repeated_wall_time_option: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getTimeZone_error.phpt
View file

@ -29,4 +29,4 @@ Warning: intlcal_get_time_zone() expects exactly 1 parameter, 2 given in %s on l
Warning: intlcal_get_time_zone(): intlcal_get_time_zone: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getTime_error.phpt
View file

@ -28,4 +28,4 @@ Warning: intlcal_get_time() expects exactly 1 parameter, 2 given in %s on line %
Warning: intlcal_get_time(): intlcal_get_time: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getType_error.phpt
View file

@ -29,4 +29,4 @@ Warning: intlcal_get_type() expects exactly 1 parameter, 2 given in %s on line %
Warning: intlcal_get_type(): intlcal_get_type: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_getWeekendTransition_error.phpt
View file

@ -41,4 +41,4 @@ Warning: intlcal_get_weekend_transition() expects exactly 2 parameters, 1 given
Warning: intlcal_get_weekend_transition(): intlcal_get_weekend_transition: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s on line %d

8
ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
View file

@ -98,11 +98,11 @@ bool(false)
Warning: intlcal_get_minimum(): intlcal_get_minimum: invalid field in %s on line %d
bool(false)
error: 4096, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, integer given
error: 4096, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, integer given
error: 4096, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, integer given
error: 4096, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, integer given

6
ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
View file

@ -105,9 +105,9 @@ bool(false)
error: 2, intlcal_get_actual_minimum() expects parameter 2 to be integer, string given
error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: bad arguments
bool(false)
error: 4096, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, integer given
error: 4096, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, integer given
error: 4096, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, integer given

2
ext/intl/tests/calendar_inDaylightTime_error.phpt
View file

@ -29,4 +29,4 @@ Warning: intlcal_in_daylight_time() expects exactly 1 parameter, 2 given in %s o
Warning: intlcal_in_daylight_time(): intlcal_in_daylight_time: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s on line %d

8
ext/intl/tests/calendar_isEquivalentTo_error.phpt
View file

@ -50,16 +50,16 @@ try {
}
--EXPECT--
error: 4096, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
error: 2, IntlCalendar::isEquivalentTo() expects exactly 1 parameter, 2 given
error: 2, IntlCalendar::isEquivalentTo(): intlcal_is_equivalent_to: bad arguments
bool(false)
error: 4096, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
error: 2, intlcal_is_equivalent_to() expects exactly 2 parameters, 1 given
error: 2, intlcal_is_equivalent_to(): intlcal_is_equivalent_to: bad arguments
bool(false)
error: 4096, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
error: 1, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
error: 4096, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given

2
ext/intl/tests/calendar_isLenient_error.phpt
View file

@ -29,4 +29,4 @@ Warning: intlcal_is_lenient() expects exactly 1 parameter, 2 given in %s on line
Warning: intlcal_is_lenient(): intlcal_is_lenient: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_isSet_error.phpt
View file

@ -39,4 +39,4 @@ Warning: intlcal_is_set() expects exactly 2 parameters, 1 given in %s on line %d
Warning: intlcal_is_set(): intlcal_is_set: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_isWeekend_error.phpt
View file

@ -35,4 +35,4 @@ Warning: intlcal_is_weekend() expects parameter 2 to be float, string given in %
Warning: intlcal_is_weekend(): intlcal_is_weekend: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_roll_error.phpt
View file

@ -34,4 +34,4 @@ bool(false)
Warning: intlcal_roll(): intlcal_set: too many arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
View file

@ -37,4 +37,4 @@ bool(false)
Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_setLenient_error.phpt
View file

@ -41,4 +41,4 @@ Warning: intlcal_set_lenient() expects parameter 2 to be boolean, array given in
Warning: intlcal_set_lenient(): intlcal_set_lenient: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
View file

@ -36,5 +36,5 @@ bool(false)
Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
View file

@ -79,4 +79,4 @@ Warning: intlcal_set_repeated_wall_time_option() expects exactly 2 parameters, 1
Warning: intlcal_set_repeated_wall_time_option(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_setTimeZone_error.phpt
View file

@ -51,4 +51,4 @@ bool(false)
error: 2, intlcal_set_time_zone() expects exactly 2 parameters, 3 given
error: 2, intlcal_set_time_zone(): intlcal_set_time_zone: bad arguments
bool(false)
error: 4096, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, integer given
error: 1, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, integer given

2
ext/intl/tests/calendar_setTime_error.phpt
View file

@ -34,4 +34,4 @@ Warning: intlcal_set_time() expects exactly 2 parameters, 3 given in %s on line
Warning: intlcal_set_time(): intlcal_set_time: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_set_error.phpt
View file

@ -38,4 +38,4 @@ bool(false)
Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/calendar_toDateTime_error.phpt
View file

@ -38,4 +38,4 @@ bool(false)
Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d
string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
Catchable fatal error: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s on line %d

2
ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
View file

@ -27,4 +27,4 @@ Warning: intlgregcal_get_gregorian_change() expects exactly 1 parameter, 2 given
Warning: intlgregcal_get_gregorian_change(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d

2
ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
View file

@ -45,4 +45,4 @@ Warning: intlgregcal_is_leap_year() expects exactly 2 parameters, 1 given in %s
Warning: intlgregcal_is_leap_year(): intlgregcal_is_leap_year: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s on line %d

2
ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
View file

@ -39,4 +39,4 @@ Warning: intlgregcal_set_gregorian_change() expects exactly 2 parameters, 1 give
Warning: intlgregcal_set_gregorian_change(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d
Fatal error: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d

2
ext/intl/tests/timezone_getDSTSavings_error.phpt
View file

@ -20,4 +20,4 @@ Warning: IntlTimeZone::getDSTSavings() expects exactly 0 parameters, 1 given in
Warning: IntlTimeZone::getDSTSavings(): intltz_get_dst_savings: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s on line %d

2
ext/intl/tests/timezone_getDisplayName_error.phpt
View file

@ -42,4 +42,4 @@ Warning: IntlTimeZone::getDisplayName() expects at most 3 parameters, 4 given in
Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s on line %d

2
ext/intl/tests/timezone_getErrorCode_error.phpt
View file

@ -20,4 +20,4 @@ Warning: IntlTimeZone::getErrorCode() expects exactly 0 parameters, 1 given in %
Warning: IntlTimeZone::getErrorCode(): intltz_get_error_code: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s on line %d

2
ext/intl/tests/timezone_getErrorMessage_error.phpt
View file

@ -20,4 +20,4 @@ Warning: IntlTimeZone::getErrorMessage() expects exactly 0 parameters, 1 given i
Warning: IntlTimeZone::getErrorMessage(): intltz_get_error_message: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s on line %d

2
ext/intl/tests/timezone_getID_error.phpt
View file

@ -20,4 +20,4 @@ Warning: IntlTimeZone::getID() expects exactly 0 parameters, 1 given in %s on li
Warning: IntlTimeZone::getID(): intltz_get_id: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s on line %d

2
ext/intl/tests/timezone_getOffset_error.phpt
View file

@ -30,4 +30,4 @@ Warning: IntlTimeZone::getOffset() expects exactly 4 parameters, 5 given in %s o
Warning: IntlTimeZone::getOffset(): intltz_get_offset: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s on line %d

2
ext/intl/tests/timezone_getRawOffset_error.phpt
View file

@ -20,4 +20,4 @@ Warning: IntlTimeZone::getRawOffset() expects exactly 0 parameters, 1 given in %
Warning: IntlTimeZone::getRawOffset(): intltz_get_raw_offset: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s on line %d

4
ext/intl/tests/timezone_hasSameRules_error.phpt
View file

@ -31,9 +31,9 @@ try {
}
--EXPECT--
int(4096)
int(1)
string(99) "Argument 1 passed to IntlTimeZone::hasSameRules() must be an instance of IntlTimeZone, string given"
int(4096)
int(1)
string(92) "Argument 1 passed to intltz_has_same_rules() must be an instance of IntlTimeZone, null given"

2
ext/intl/tests/timezone_toDateTimeZone_error.phpt
View file

@ -35,4 +35,4 @@ Warning: intltz_to_date_time_zone() expects exactly 1 parameter, 0 given in %s o
Warning: intltz_to_date_time_zone(): intltz_to_date_time_zone: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s on line %d
Fatal error: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s on line %d

2
ext/intl/tests/timezone_useDaylightTime_error.phpt
View file

@ -19,4 +19,4 @@ Warning: IntlTimeZone::useDaylightTime() expects exactly 0 parameters, 1 given i
Warning: IntlTimeZone::useDaylightTime(): intltz_use_daylight_time: bad arguments in %s on line %d
bool(false)
Catchable fatal error: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s on line %d
Fatal error: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s on line %d

2
ext/intl/tests/transliterator_create_inverse_error.phpt
View file

@ -18,4 +18,4 @@ Warning: Transliterator::createInverse() expects exactly 0 parameters, 1 given i
Warning: Transliterator::createInverse(): transliterator_create_inverse: bad arguments in %s on line %d
Catchable fatal error: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s on line %d
Fatal error: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s on line %d

2
ext/intl/tests/transliterator_get_error_code_error.phpt
View file

@ -21,4 +21,4 @@ Warning: Transliterator::getErrorCode() expects exactly 0 parameters, 1 given in
Warning: Transliterator::getErrorCode(): transliterator_get_error_code: unable to parse input params in %s on line %d
Catchable fatal error: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s on line %d
Fatal error: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s on line %d

2
ext/intl/tests/transliterator_get_error_message_error.phpt
View file

@ -21,4 +21,4 @@ Warning: Transliterator::getErrorMessage() expects exactly 0 parameters, 1 given
Warning: Transliterator::getErrorMessage(): transliterator_get_error_message: unable to parse input params in %s on line %d
Catchable fatal error: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s on line %d
Fatal error: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s on line %d

4
ext/mysqli/tests/bug33491.phpt
View file

@ -1,7 +1,7 @@
--TEST--
Bug #33491 (extended mysqli class crashes when result is not object)
--INI--
error_reporting=4096
error_reporting=1
--SKIPIF--
<?php
require_once('skipif.inc');
@ -26,4 +26,4 @@ $DB->query_single('SELECT DATE()');
?>
--EXPECTF--
Catchable fatal error: Call to a member function fetch_row() on boolean in %sbug33491.php on line %d
Fatal error: Call to a member function fetch_row() on boolean in %sbug33491.php on line %d

2
ext/mysqli/tests/mysqli_change_user_new.phpt
View file

@ -41,4 +41,4 @@ Warning: mysqli_query(): MySQL server has gone away in %s on line %d
Warning: mysqli_query(): Error reading result set's header in %s on line %d
[003] [2006] MySQL server has gone away
Catchable fatal error: Call to a member function fetch_assoc() on %s in %s on line %d
Fatal error: Call to a member function fetch_assoc() on %s in %s on line %d

4
ext/mysqli/tests/mysqli_fetch_object.phpt
View file

@ -150,6 +150,6 @@ NULL
NULL
[E_WARNING] mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d
NULL
[E_RECOVERABLE_ERROR] Argument 3 passed to mysqli_fetch_object() must be of the type array, string given in %s on line %d
[E_ERROR] Argument 3 passed to mysqli_fetch_object() must be of the type array, string given in %s on line %d
Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d
Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d

6
ext/mysqli/tests/mysqli_fetch_object_oo.phpt
View file

@ -129,9 +129,9 @@ require_once('skipifconnectfailure.inc');
%s on line %d
[E_WARNING] mysqli_result::fetch_object(): Couldn't fetch mysqli_result in %s on line %d
[E_WARNING] mysqli_result::fetch_object() expects parameter 1 to be string, object given in %s on line %d
[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, null given in %s on line %d
[E_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
[E_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
[E_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, null given in %s on line %d
[E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d
[E_NOTICE] Undefined variable: b in %s on line %d
NULL

2
ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
View file

@ -93,4 +93,4 @@ array(1) {
Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d
Catchable fatal error: Call to a member function execute() on boolean in %s on line %d
Fatal error: Call to a member function execute() on boolean in %s on line %d

2
ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
View file

@ -36,4 +36,4 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named
Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d
Catchable fatal error: Call to a member function execute() on boolean in %s on line %d
Fatal error: Call to a member function execute() on boolean in %s on line %d

2
ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
View file

@ -56,4 +56,4 @@ Testing native PS...
Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d
Catchable fatal error: Call to a member function execute() on boolean in %s on line %d
Fatal error: Call to a member function execute() on boolean in %s on line %d

2
ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
View file

@ -99,4 +99,4 @@ Native Prepared Statements...
Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d
Catchable fatal error: Call to a member function errorInfo() on boolean in %s on line %d
Fatal error: Call to a member function errorInfo() on boolean in %s on line %d

2
ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
View file

@ -17,4 +17,4 @@ var_dump($a);
?>
--EXPECTF--
Catchable fatal error: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s on line 8
Fatal error: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s on line 8

2
ext/reflection/tests/bug64007.phpt
View file

@ -16,4 +16,4 @@ var_dump($generator);
--EXPECTF--
string(%d) "Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor"
Catchable fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php on line %d
Fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php on line %d

2
ext/simplexml/tests/SimpleXMLElement_xpath.phpt
View file

@ -11,4 +11,4 @@ Notice: Undefined variable: x in %s on line %d
Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d
Catchable fatal error: Call to a member function xpath() on null in %s on line %d
Fatal error: Call to a member function xpath() on null in %s on line %d

2
ext/spl/tests/iterator_count.phpt
View file

@ -23,4 +23,4 @@ Warning: iterator_count() expects exactly 1 parameter, 0 given in %s
Warning: iterator_count() expects exactly 1 parameter, 2 given in %s
Catchable fatal error: Argument 1 passed to iterator_count() must implement interface Traversable, %unicode_string_optional% given %s
Fatal error: Argument 1 passed to iterator_count() must implement interface Traversable, %unicode_string_optional% given %s

2
ext/spl/tests/iterator_to_array.phpt
View file

@ -22,4 +22,4 @@ Warning: iterator_to_array() expects at least 1 parameter, 0 given in %s
Warning: iterator_to_array() expects at most 2 parameters, 3 given in %s
Catchable fatal error: Argument 1 passed to iterator_to_array() must implement interface Traversable, %unicode_string_optional% given %s
Fatal error: Argument 1 passed to iterator_to_array() must implement interface Traversable, %unicode_string_optional% given %s

2
ext/standard/tests/file/bug38450_3.phpt
View file

@ -104,4 +104,4 @@ echo "Done\n";
--EXPECTF--
Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d
Catchable fatal error: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s on line %d
Fatal error: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s on line %d

2
tests/classes/autoload_009.phpt
View file

@ -15,6 +15,6 @@ Ensure type hints for unknown types do not trigger autoload.
?>
--EXPECTF--
Catchable fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s
Fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s

2
tests/classes/interfaces_003.phpt
View file

@ -23,4 +23,4 @@ $obj = new MyTestClass;
===DONE===
--EXPECTF--
Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php on line %d
Fatal error: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php on line %d

2
tests/classes/type_hinting_001.phpt
View file

@ -35,4 +35,4 @@ $a->b($b);
?>
--EXPECTF--
Catchable fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s on line 12
Fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s on line 12

Some files were not shown because too many files have changed in this diff Show more