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

Fix GH-8329 Print true/false instead of bool in error and debug messages (#8385)

Browse source
This commit is contained in:
Máté Kocsis 2023-01-23 10:52:14 +01:00 • committed by GitHub
parent f8f7fd2db1
commit 7936c8085e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
145 changed files with 563 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/tests/011.phpt
View file

@ -89,7 +89,7 @@ bool(false)
property_exists(): Argument #1 ($object_or_class) must be of type object|string, array given
property_exists(): Argument #1 ($object_or_class) must be of type object|string, int given
property_exists(): Argument #1 ($object_or_class) must be of type object|string, float given
property_exists(): Argument #1 ($object_or_class) must be of type object|string, bool given
property_exists(): Argument #1 ($object_or_class) must be of type object|string, true given
property_exists(): Argument #1 ($object_or_class) must be of type object|string, null given
bool(true)
bool(true)

6
Zend/tests/024.phpt
View file

@ -17,14 +17,14 @@ var_dump($a->$b->{$c[1]});
--EXPECTF--
Warning: Undefined variable $a in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Undefined variable $a in %s on line %d
Warning: Undefined variable $c in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Undefined variable $a in %s on line %d
@ -49,7 +49,7 @@ NULL
Warning: Undefined variable $c in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Attempt to read property "1" on int in %s on line %d

30
Zend/tests/033.phpt
View file

@ -27,39 +27,39 @@ try {
--EXPECTF--
Warning: Undefined variable $arr in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Undefined variable $arr in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Undefined variable $arr in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Attempt to read property "foo" on null in %s on line %d
Attempt to assign property "foo" on null

4
Zend/tests/assign_dim_obj_null_return.phpt
View file

@ -79,5 +79,5 @@ Cannot add element to the array as the next element is already occupied
Illegal offset type
Illegal offset type
Cannot use a scalar value as an array
Attempt to assign property "foo" on bool
Attempt to assign property "foo" on bool
Attempt to assign property "foo" on true
Attempt to assign property "foo" on true

2
Zend/tests/assign_to_var_003.phpt
View file

@ -13,7 +13,7 @@ var_dump($var1);
echo "Done\n";
?>
--EXPECTF--
Warning: Trying to access array offset on value of type float in %s on line %d
Warning: Trying to access array offset on float in %s on line %d
NULL
NULL
Done

12
Zend/tests/bug44660.phpt
View file

@ -48,22 +48,22 @@ var_dump($a);
?>
--EXPECTF--
--> read access:
Warning: Attempt to read property "p" on bool in %s on line %d
Warning: Attempt to read property "p" on true in %s on line %d
--> direct assignment:
Attempt to assign property "p" on bool
Attempt to assign property "p" on true
--> increment:
Attempt to increment/decrement property "p" on bool
Attempt to increment/decrement property "p" on true
--> reference assignment:
Attempt to modify property "p" on bool
Attempt to modify property "p" on true
--> reference assignment:
Attempt to modify property "p" on bool
Attempt to modify property "p" on true
--> indexed assignment:
Attempt to modify property "p" on bool
Attempt to modify property "p" on true
--> Confirm assignments have had no impact:
bool(true)

2
Zend/tests/bug81631.phpt
View file

@ -8,7 +8,7 @@ var_dump($b::class);
--EXPECTF--
Warning: Undefined variable $b in %s on line 3
Fatal error: Uncaught TypeError: Cannot use "::class" on value of type null in %s:3
Fatal error: Uncaught TypeError: Cannot use "::class" on null in %s:3
Stack trace:
#0 {main}
thrown in %s on line 3

2
Zend/tests/call_user_func_007.phpt
View file

@ -13,7 +13,7 @@ var_dump($a);
--EXPECTF--
Warning: Undefined array key 0 in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: foo(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d
array(0) {

2
Zend/tests/class_on_constant_evaluated_expression.phpt
View file

@ -7,4 +7,4 @@ An error should be generated when using ::class on a constant evaluated expressi
?>
--EXPECTF--
Fatal error: Cannot use "::class" on value of type int in %s on line %d
Fatal error: Cannot use "::class" on int in %s on line %d

2
Zend/tests/class_on_object.phpt
View file

@ -25,4 +25,4 @@ try {
string(8) "stdClass"
string(8) "stdClass"
string(8) "stdClass"
Cannot use "::class" on value of type null
Cannot use "::class" on null

2
Zend/tests/const_expr_dim_on_null_warning.phpt
View file

@ -6,5 +6,5 @@ const C = (null)['foo'];
var_dump(C);
?>
--EXPECTF--
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL

2
Zend/tests/dereference_002.phpt
View file

@ -70,7 +70,7 @@ array(2) {
}
int(1)
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Undefined array key 4 in %s on line %d

4
Zend/tests/dereference_010.phpt
View file

@ -21,10 +21,10 @@ var_dump(b()[1]);
?>
--EXPECTF--
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Fatal error: Uncaught Error: Cannot use object of type stdClass as array in %s:%d

4
Zend/tests/dereference_014.phpt
View file

@ -27,12 +27,12 @@ var_dump($h);
?>
--EXPECTF--
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Attempt to read property "a" on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Attempt to read property "b" on null in %s on line %d
NULL

2
Zend/tests/isset_003.phpt
View file

@ -33,7 +33,7 @@ Warning: Undefined variable $c in %s on line %d
Warning: Undefined variable $d in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
Warning: Attempt to read property "" on string in %s on line %d
bool(false)

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

@ -35,7 +35,7 @@ try {
?>
--EXPECT--
string(39) "Call to a member function bar() on bool"
string(40) "Call to a member function bar() on false"
string(40) "Call to a member function bar() on array"
string(38) "Call to a member function bar() on int"
string(40) "Call to a member function bar() on float"

18
Zend/tests/offset_bool.phpt
View file

@ -25,30 +25,30 @@ var_dump($bool[$arr]);
echo "Done\n";
?>
--EXPECTF--
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on true in %s on line %d
NULL
Done

18
Zend/tests/offset_long.phpt
View file

@ -25,30 +25,30 @@ var_dump($long[$arr]);
echo "Done\n";
?>
--EXPECTF--
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Warning: Trying to access array offset on value of type int in %s on line %d
Warning: Trying to access array offset on int in %s on line %d
NULL
Done

18
Zend/tests/offset_null.phpt
View file

@ -25,30 +25,30 @@ var_dump($null[$arr]);
echo "Done\n";
?>
--EXPECTF--
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Done

2
Zend/tests/prop_const_expr/basic_nullsafe.phpt
View file

@ -39,7 +39,7 @@ Warning: Attempt to read property "test" on null in %s on line %d
NULL
NULL
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
NULL
Printer

12
Zend/tests/type_declarations/scalar_strict.phpt
View file

@ -84,10 +84,10 @@ int(2147483647)
*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
*** Trying bool(true)
*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($i) must be of type int, true given, called in %s on line %d
*** Trying bool(false)
*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($i) must be of type int, false given, called in %s on line %d
*** Trying NULL
*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d
@ -137,10 +137,10 @@ float(2147483647)
float(NAN)
*** Trying bool(true)
*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($f) must be of type float, true given, called in %s on line %d
*** Trying bool(false)
*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($f) must be of type float, false given, called in %s on line %d
*** Trying NULL
*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d
@ -190,10 +190,10 @@ string(0) ""
*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
*** Trying bool(true)
*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($s) must be of type string, true given, called in %s on line %d
*** Trying bool(false)
*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($s) must be of type string, false given, called in %s on line %d
*** Trying NULL
*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d

12
Zend/tests/type_declarations/scalar_strict_64bit.phpt
View file

@ -84,10 +84,10 @@ int(9223372036854775807)
*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
*** Trying bool(true)
*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($i) must be of type int, true given, called in %s on line %d
*** Trying bool(false)
*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($i) must be of type int, false given, called in %s on line %d
*** Trying NULL
*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d
@ -137,10 +137,10 @@ float(9.223372036854776E+18)
float(NAN)
*** Trying bool(true)
*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($f) must be of type float, true given, called in %s on line %d
*** Trying bool(false)
*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($f) must be of type float, false given, called in %s on line %d
*** Trying NULL
*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d
@ -190,10 +190,10 @@ string(0) ""
*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
*** Trying bool(true)
*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($s) must be of type string, true given, called in %s on line %d
*** Trying bool(false)
*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($s) must be of type string, false given, called in %s on line %d
*** Trying NULL
*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d

12
Zend/tests/type_declarations/scalar_strict_basic.phpt
View file

@ -63,10 +63,10 @@ int(1)
*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
*** Trying true value
*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($i) must be of type int, true given, called in %s on line %d
*** Trying false value
*** Caught {closure}(): Argument #1 ($i) must be of type int, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($i) must be of type int, false given, called in %s on line %d
*** Trying null value
*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d
@ -92,10 +92,10 @@ float(1)
*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
*** Trying true value
*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($f) must be of type float, true given, called in %s on line %d
*** Trying false value
*** Caught {closure}(): Argument #1 ($f) must be of type float, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($f) must be of type float, false given, called in %s on line %d
*** Trying null value
*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d
@ -121,10 +121,10 @@ Testing 'string' type:
string(1) "1"
*** Trying true value
*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($s) must be of type string, true given, called in %s on line %d
*** Trying false value
*** Caught {closure}(): Argument #1 ($s) must be of type string, bool given, called in %s on line %d
*** Caught {closure}(): Argument #1 ($s) must be of type string, false given, called in %s on line %d
*** Trying null value
*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d

2
Zend/tests/type_declarations/typed_properties_111.phpt
View file

@ -17,4 +17,4 @@ try {
?>
--EXPECT--
Cannot assign bool to property Foo::$value of type false
Cannot assign true to property Foo::$value of type false

2
Zend/tests/type_declarations/typed_properties_112.phpt
View file

@ -16,4 +16,4 @@ try {
?>
--EXPECT--
Cannot assign bool to property Foo::$value of type true
Cannot assign false to property Foo::$value of type true

18
Zend/tests/type_declarations/union_types/type_checking_strict.phpt
View file

@ -71,8 +71,8 @@ INF => INF
"42x" => Argument ... must be of type int|float, string given
"x" => Argument ... must be of type int|float, string given
"" => Argument ... must be of type int|float, string given
true => Argument ... must be of type int|float, bool given
false => Argument ... must be of type int|float, bool given
true => Argument ... must be of type int|float, true given
false => Argument ... must be of type int|float, false given
null => Argument ... must be of type int|float, null given
[] => Argument ... must be of type int|float, array given
new stdClass => Argument ... must be of type int|float, stdClass given
@ -87,7 +87,7 @@ INF => INF
"42x" => Argument ... must be of type int|float|false, string given
"x" => Argument ... must be of type int|float|false, string given
"" => Argument ... must be of type int|float|false, string given
true => Argument ... must be of type int|float|false, bool given
true => Argument ... must be of type int|float|false, true given
false => false
null => Argument ... must be of type int|float|false, null given
[] => Argument ... must be of type int|float|false, array given
@ -135,8 +135,8 @@ INF => Argument ... must be of type string|int|null, float given
"42x" => "42x"
"x" => "x"
"" => ""
true => Argument ... must be of type string|int|null, bool given
false => Argument ... must be of type string|int|null, bool given
true => Argument ... must be of type string|int|null, true given
false => Argument ... must be of type string|int|null, false given
null => null
[] => Argument ... must be of type string|int|null, array given
new stdClass => Argument ... must be of type string|int|null, stdClass given
@ -167,8 +167,8 @@ INF => INF
"42x" => Argument ... must be of type array|float, string given
"x" => Argument ... must be of type array|float, string given
"" => Argument ... must be of type array|float, string given
true => Argument ... must be of type array|float, bool given
false => Argument ... must be of type array|float, bool given
true => Argument ... must be of type array|float, true given
false => Argument ... must be of type array|float, false given
null => Argument ... must be of type array|float, null given
[] => []
new stdClass => Argument ... must be of type array|float, stdClass given
@ -183,8 +183,8 @@ INF => Argument ... must be of type array|string, float given
"42x" => "42x"
"x" => "x"
"" => ""
true => Argument ... must be of type array|string, bool given
false => Argument ... must be of type array|string, bool given
true => Argument ... must be of type array|string, true given
false => Argument ... must be of type array|string, false given
null => Argument ... must be of type array|string, null given
[] => []
new stdClass => Argument ... must be of type array|string, stdClass given

42
Zend/zend_API.c
View file

@ -101,7 +101,7 @@ ZEND_API ZEND_COLD void zend_wrong_property_read(zval *object, zval *property)
{
zend_string *tmp_property_name;
zend_string *property_name = zval_get_tmp_string(property, &tmp_property_name);
zend_error(E_WARNING, "Attempt to read property \"%s\" on %s", ZSTR_VAL(property_name), zend_zval_type_name(object));
zend_error(E_WARNING, "Attempt to read property \"%s\" on %s", ZSTR_VAL(property_name), zend_zval_value_name(object));
zend_tmp_string_release(tmp_property_name);
}
@ -142,7 +142,26 @@ ZEND_API const char *zend_get_type_by_const(int type) /* {{{ */
}
/* }}} */
ZEND_API const char *zend_zval_type_name(const zval *arg) /* {{{ */
ZEND_API const char *zend_zval_value_name(const zval *arg)
{
ZVAL_DEREF(arg);
if (Z_ISUNDEF_P(arg)) {
return "null";
}
if (Z_TYPE_P(arg) == IS_OBJECT) {
return ZSTR_VAL(Z_OBJCE_P(arg)->name);
} else if (Z_TYPE_P(arg) == IS_FALSE) {
return "false";
} else if (Z_TYPE_P(arg) == IS_TRUE) {
return "true";
}
return zend_get_type_by_const(Z_TYPE_P(arg));
}
ZEND_API const char *zend_zval_type_name(const zval *arg)
{
ZVAL_DEREF(arg);
@ -156,7 +175,6 @@ ZEND_API const char *zend_zval_type_name(const zval *arg) /* {{{ */
return zend_get_type_by_const(Z_TYPE_P(arg));
}
/* }}} */
/* This API exists *only* for use in gettype().
* For anything else, you likely want zend_zval_type_name(). */
@ -277,7 +295,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(uint32_t n
return;
}
zend_argument_type_error(num, "must be %s, %s given", expected_error[expected_type], zend_zval_type_name(arg));
zend_argument_type_error(num, "must be %s, %s given", expected_error[expected_type], zend_zval_value_name(arg));
}
/* }}} */
@ -287,7 +305,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(uint32_t
return;
}
zend_argument_type_error(num, "must be of type %s, %s given", name, zend_zval_type_name(arg));
zend_argument_type_error(num, "must be of type %s, %s given", name, zend_zval_value_name(arg));
}
/* }}} */
@ -297,7 +315,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_null_error(u
return;
}
zend_argument_type_error(num, "must be of type ?%s, %s given", name, zend_zval_type_name(arg));
zend_argument_type_error(num, "must be of type ?%s, %s given", name, zend_zval_value_name(arg));
}
/* }}} */
@ -307,7 +325,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_long_error(u
return;
}
zend_argument_type_error(num, "must be of type %s|int, %s given", name, zend_zval_type_name(arg));
zend_argument_type_error(num, "must be of type %s|int, %s given", name, zend_zval_value_name(arg));
}
/* }}} */
@ -317,7 +335,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_long_or_null
return;
}
zend_argument_type_error(num, "must be of type %s|int|null, %s given", name, zend_zval_type_name(arg));
zend_argument_type_error(num, "must be of type %s|int|null, %s given", name, zend_zval_value_name(arg));
}
/* }}} */
@ -327,7 +345,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_error
return;
}
zend_argument_type_error(num, "must be of type %s|string, %s given", name, zend_zval_type_name(arg));
zend_argument_type_error(num, "must be of type %s|string, %s given", name, zend_zval_value_name(arg));
}
/* }}} */
@ -337,7 +355,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_or_nu
return;
}
zend_argument_type_error(num, "must be of type %s|string|null, %s given", name, zend_zval_type_name(arg));
zend_argument_type_error(num, "must be of type %s|string|null, %s given", name, zend_zval_value_name(arg));
}
/* }}} */
@ -884,7 +902,7 @@ static const char *zend_parse_arg_impl(zval *arg, va_list *va, const char **spec
if (!zend_parse_arg_object(arg, p, ce, check_null)) {
if (ce) {
if (check_null) {
zend_spprintf(error, 0, "must be of type ?%s, %s given", ZSTR_VAL(ce->name), zend_zval_type_name(arg));
zend_spprintf(error, 0, "must be of type ?%s, %s given", ZSTR_VAL(ce->name), zend_zval_value_name(arg));
return "";
} else {
return ZSTR_VAL(ce->name);
@ -1004,7 +1022,7 @@ static zend_result zend_parse_arg(uint32_t arg_num, zval *arg, va_list *va, cons
}
efree(error);
} else {
zend_argument_type_error(arg_num, "must be of type %s, %s given", expected_type, zend_zval_type_name(arg));
zend_argument_type_error(arg_num, "must be of type %s, %s given", expected_type, zend_zval_value_name(arg));
}
} else if (error) {
efree(error);

1
Zend/zend_API.h
View file

@ -355,6 +355,7 @@ ZEND_API zend_result zend_parse_parameters_ex(int flags, uint32_t num_args, cons
#define zend_parse_parameters_throw(num_args, ...) \
zend_parse_parameters(num_args, __VA_ARGS__)
ZEND_API const char *zend_zval_type_name(const zval *arg);
ZEND_API const char *zend_zval_value_name(const zval *arg);
ZEND_API zend_string *zend_zval_get_legacy_type(const zval *arg);
ZEND_API zend_result zend_parse_method_parameters(uint32_t num_args, zval *this_ptr, const char *type_spec, ...);

2
Zend/zend_attributes.c
View file

@ -50,7 +50,7 @@ void validate_attribute(zend_attribute *attr, uint32_t target, zend_class_entry
if (Z_TYPE(flags) != IS_LONG) {
zend_error_noreturn(E_ERROR,
"Attribute::__construct(): Argument #1 ($flags) must be of type int, %s given",
zend_zval_type_name(&flags)
zend_zval_value_name(&flags)
);
}

4
Zend/zend_builtin_functions.c
View file

@ -880,7 +880,7 @@ ZEND_FUNCTION(method_exists)
RETURN_FALSE;
}
} else {
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(klass));
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_value_name(klass));
RETURN_THROWS();
}
@ -942,7 +942,7 @@ ZEND_FUNCTION(property_exists)
} else if (Z_TYPE_P(object) == IS_OBJECT) {
ce = Z_OBJCE_P(object);
} else {
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(object));
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_value_name(object));
RETURN_THROWS();
}

6
Zend/zend_compile.c
View file

@ -7614,7 +7614,7 @@ static void zend_compile_prop_decl(zend_ast *ast, zend_ast *type_ast, uint32_t f
} else {
zend_error_noreturn(E_COMPILE_ERROR,
"Cannot use %s as default value for property %s::$%s of type %s",
zend_zval_type_name(&value_zv),
zend_zval_value_name(&value_zv),
ZSTR_VAL(ce->name), ZSTR_VAL(name), ZSTR_VAL(str));
}
}
@ -9711,8 +9711,8 @@ static void zend_compile_class_name(znode *result, zend_ast *ast) /* {{{ */
if (expr_node.op_type == IS_CONST) {
/* Unlikely case that happen if class_ast is constant folded.
* Handle it here, to avoid needing a CONST specialization in the VM. */
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use \"::class\" on value of type %s",
zend_zval_type_name(&expr_node.u.constant));
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use \"::class\" on %s",
zend_zval_value_name(&expr_node.u.constant));
}
zend_emit_op_tmp(result, ZEND_FETCH_CLASS_NAME, &expr_node, NULL);

24
Zend/zend_execute.c
View file

@ -635,7 +635,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_throw_non_object_erro
|| opline->opcode == ZEND_POST_DEC_OBJ) {
zend_throw_error(NULL,
"Attempt to increment/decrement property \"%s\" on %s",
ZSTR_VAL(property_name), zend_zval_type_name(object)
ZSTR_VAL(property_name), zend_zval_value_name(object)
);
} else if (opline->opcode == ZEND_FETCH_OBJ_W
|| opline->opcode == ZEND_FETCH_OBJ_RW
@ -643,12 +643,12 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_throw_non_object_erro
|| opline->opcode == ZEND_ASSIGN_OBJ_REF) {
zend_throw_error(NULL,
"Attempt to modify property \"%s\" on %s",
ZSTR_VAL(property_name), zend_zval_type_name(object)
ZSTR_VAL(property_name), zend_zval_value_name(object)
);
} else {
zend_throw_error(NULL,
"Attempt to assign property \"%s\" on %s",
ZSTR_VAL(property_name), zend_zval_type_name(object)
ZSTR_VAL(property_name), zend_zval_value_name(object)
);
}
zend_tmp_string_release(tmp_property_name);
@ -675,7 +675,7 @@ static ZEND_COLD void zend_verify_type_error_common(
*need_msg = zend_type_to_string_resolved(arg_info->type, zf->common.scope);
if (value) {
*given_kind = zend_zval_type_name(value);
*given_kind = zend_zval_value_name(value);
} else {
*given_kind = "none";
}
@ -824,7 +824,7 @@ ZEND_COLD zend_never_inline void zend_verify_property_type_error(const zend_prop
type_str = zend_type_to_string(info->type);
zend_type_error("Cannot assign %s to property %s::$%s of type %s",
zend_zval_type_name(property),
zend_zval_value_name(property),
ZSTR_VAL(info->ce->name),
zend_get_unmangled_property_name(info->name),
ZSTR_VAL(type_str));
@ -1414,7 +1414,7 @@ ZEND_API bool zend_verify_internal_return_type(zend_function *zf, zval *ret)
if (ZEND_TYPE_FULL_MASK(ret_info->type) & MAY_BE_VOID) {
if (UNEXPECTED(Z_TYPE_P(ret) != IS_NULL)) {
zend_verify_void_return_error(zf, zend_zval_type_name(ret), "");
zend_verify_void_return_error(zf, zend_zval_value_name(ret), "");
return 0;
}
return 1;
@ -2181,7 +2181,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(cons
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_invalid_method_call(zval *object, zval *function_name)
{
zend_throw_error(NULL, "Call to a member function %s() on %s",
Z_STRVAL_P(function_name), zend_zval_type_name(object));
Z_STRVAL_P(function_name), zend_zval_value_name(object));
}
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_non_static_method_call(const zend_function *fbc)
@ -2786,8 +2786,8 @@ try_string_offset:
ZVAL_UNDEFINED_OP2();
}
if (!is_list && type != BP_VAR_IS) {
zend_error(E_WARNING, "Trying to access array offset on value of type %s",
zend_zval_type_name(container));
zend_error(E_WARNING, "Trying to access array offset on %s",
zend_zval_value_name(container));
}
ZVAL_NULL(result);
}
@ -2986,7 +2986,7 @@ static ZEND_COLD void ZEND_FASTCALL zend_array_key_exists_error(
}
if (!EG(exception)) {
zend_type_error("array_key_exists(): Argument #2 ($array) must be of type array, %s given",
zend_zval_type_name(subject));
zend_zval_value_name(subject));
}
}
@ -3406,7 +3406,7 @@ ZEND_API ZEND_COLD void zend_throw_ref_type_error_type(const zend_property_info
ZEND_API ZEND_COLD void zend_throw_ref_type_error_zval(const zend_property_info *prop, const zval *zv) {
zend_string *type_str = zend_type_to_string(prop->type);
zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s",
zend_zval_type_name(zv),
zend_zval_value_name(zv),
ZSTR_VAL(prop->ce->name),
zend_get_unmangled_property_name(prop->name),
ZSTR_VAL(type_str)
@ -3418,7 +3418,7 @@ ZEND_API ZEND_COLD void zend_throw_conflicting_coercion_error(const zend_propert
zend_string *type1_str = zend_type_to_string(prop1->type);
zend_string *type2_str = zend_type_to_string(prop2->type);
zend_type_error("Cannot assign %s to reference held by property %s::$%s of type %s and property %s::$%s of type %s, as this would result in an inconsistent type conversion",
zend_zval_type_name(zv),
zend_zval_value_name(zv),
ZSTR_VAL(prop1->ce->name),
zend_get_unmangled_property_name(prop1->name),
ZSTR_VAL(type1_str),

6
Zend/zend_operators.c
View file

@ -1560,7 +1560,7 @@ try_again:
if (result != op1) {
ZVAL_UNDEF(result);
}
zend_type_error("Cannot perform bitwise not on %s", zend_zval_type_name(op1));
zend_type_error("Cannot perform bitwise not on %s", zend_zval_value_name(op1));
return FAILURE;
}
}
@ -2541,7 +2541,7 @@ try_again:
ZEND_FALLTHROUGH;
case IS_RESOURCE:
case IS_ARRAY:
zend_type_error("Cannot increment %s", zend_zval_type_name(op1));
zend_type_error("Cannot increment %s", zend_zval_value_name(op1));
return FAILURE;
EMPTY_SWITCH_DEFAULT_CASE()
}
@ -2603,7 +2603,7 @@ try_again:
ZEND_FALLTHROUGH;
case IS_RESOURCE:
case IS_ARRAY:
zend_type_error("Cannot decrement %s", zend_zval_type_name(op1));
zend_type_error("Cannot decrement %s", zend_zval_value_name(op1));
return FAILURE;
EMPTY_SWITCH_DEFAULT_CASE()
}

18
Zend/zend_vm_def.h
View file

@ -5264,7 +5264,7 @@ ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, ANY, ANY, NUM)
ZEND_VM_C_GOTO(send_array);
}
}
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_type_name(args));
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_value_name(args));
FREE_OP2();
FREE_OP1();
HANDLE_EXCEPTION();
@ -5290,7 +5290,7 @@ ZEND_VM_C_LABEL(send_array):
|| !zend_parse_arg_long_weak(op2, &len, /* arg_num */ 3)) {
zend_type_error(
"array_slice(): Argument #3 ($length) must be of type ?int, %s given",
zend_zval_type_name(op2));
zend_zval_value_name(op2));
FREE_OP2();
FREE_OP1();
HANDLE_EXCEPTION();
@ -6679,7 +6679,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET_R, CONST|TMP|VAR|CV, JMP_ADDR)
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
FREE_OP1();
@ -6769,7 +6769,7 @@ ZEND_VM_COLD_CONST_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR)
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
FREE_OP1();
@ -7143,7 +7143,7 @@ ZEND_VM_HANDLER(126, ZEND_FE_FETCH_RW, VAR, ANY, JMP_ADDR)
value_type = Z_TYPE_INFO_P(value);
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array));
if (UNEXPECTED(EG(exception))) {
UNDEF_RESULT();
HANDLE_EXCEPTION();
@ -8534,7 +8534,7 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);
@ -8629,7 +8629,7 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, CV|TMPVAR|UNUSED|CLASS_FETCH, ANY)
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {
zend_type_error("Cannot use \"::class\" on value of type %s", zend_zval_type_name(op));
zend_type_error("Cannot use \"::class\" on %s", zend_zval_value_name(op));
ZVAL_UNDEF(EX_VAR(opline->result.var));
FREE_OP1();
HANDLE_EXCEPTION();
@ -9212,7 +9212,7 @@ ZEND_VM_COLD_CONST_HANDLER(190, ZEND_COUNT, CONST|TMPVAR|CV, UNUSED)
ZVAL_UNDEFINED_OP1();
}
count = 0;
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_value_name(op1));
break;
}
@ -9250,7 +9250,7 @@ ZEND_VM_COLD_CONST_HANDLER(191, ZEND_GET_CLASS, UNUSED|CONST|TMPVAR|CV, UNUSED)
if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
ZVAL_UNDEFINED_OP1();
}
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_value_name(op1));
ZVAL_UNDEF(EX_VAR(opline->result.var));
}
break;

48
Zend/zend_vm_execute.h generated
View file

@ -2421,7 +2421,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_ARRAY_SPEC_HANDLER(ZEND_O
goto send_array;
}
}
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_type_name(args));
zend_type_error("call_user_func_array(): Argument #2 ($args) must be of type array, %s given", zend_zval_value_name(args));
FREE_OP(opline->op2_type, opline->op2.var);
FREE_OP(opline->op1_type, opline->op1.var);
HANDLE_EXCEPTION();
@ -2447,7 +2447,7 @@ send_array:
|| !zend_parse_arg_long_weak(op2, &len, /* arg_num */ 3)) {
zend_type_error(
"array_slice(): Argument #3 ($length) must be of type ?int, %s given",
zend_zval_type_name(op2));
zend_zval_value_name(op2));
FREE_OP(opline->op2_type, opline->op2.var);
FREE_OP(opline->op1_type, opline->op1.var);
HANDLE_EXCEPTION();
@ -5162,7 +5162,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_CONST_HANDLER(
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
@ -5251,7 +5251,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
@ -5620,7 +5620,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CONST
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);
@ -10728,7 +10728,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CONST_
ZVAL_UNDEFINED_OP1();
}
count = 0;
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_value_name(op1));
break;
}
@ -10766,7 +10766,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_CO
if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
ZVAL_UNDEFINED_OP1();
}
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_value_name(op1));
ZVAL_UNDEF(EX_VAR(opline->result.var));
}
break;
@ -14793,7 +14793,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_TMPVAR_HANDLER(ZEN
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);
@ -14850,7 +14850,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_TMPVAR_H
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {
zend_type_error("Cannot use \"::class\" on value of type %s", zend_zval_type_name(op));
zend_type_error("Cannot use \"::class\" on %s", zend_zval_value_name(op));
ZVAL_UNDEF(EX_VAR(opline->result.var));
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
HANDLE_EXCEPTION();
@ -17968,7 +17968,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_TMPVAR_UNUSED_HANDL
ZVAL_UNDEFINED_OP1();
}
count = 0;
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_value_name(op1));
break;
}
@ -18006,7 +18006,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_TMPVAR_UNUSED_H
if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
ZVAL_UNDEFINED_OP1();
}
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_value_name(op1));
ZVAL_UNDEF(EX_VAR(opline->result.var));
}
break;
@ -19276,7 +19276,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_TMP_HANDLER(ZE
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@ -19365,7 +19365,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_TMP_HANDLER(Z
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@ -21932,7 +21932,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_VAR_HANDLER(ZE
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@ -22022,7 +22022,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_VAR_HANDLER(Z
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
@ -22278,7 +22278,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_RW_SPEC_VAR_HANDLER(Z
value_type = Z_TYPE_INFO_P(value);
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array));
if (UNEXPECTED(EG(exception))) {
UNDEF_RESULT();
HANDLE_EXCEPTION();
@ -31954,7 +31954,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_H
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {
zend_type_error("Cannot use \"::class\" on value of type %s", zend_zval_type_name(op));
zend_type_error("Cannot use \"::class\" on %s", zend_zval_value_name(op));
ZVAL_UNDEF(EX_VAR(opline->result.var));
HANDLE_EXCEPTION();
@ -36225,7 +36225,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_UNUSED_UNUSED_H
if (IS_UNUSED == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
ZVAL_UNDEFINED_OP1();
}
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_value_name(op1));
ZVAL_UNDEF(EX_VAR(opline->result.var));
}
break;
@ -39078,7 +39078,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_R_SPEC_CV_HANDLER(ZEN
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
@ -39167,7 +39167,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_RESET_RW_SPEC_CV_HANDLER(ZE
}
}
} else {
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_type_name(array_ptr));
zend_error(E_WARNING, "foreach() argument must be of type array|object, %s given", zend_zval_value_name(array_ptr));
ZVAL_UNDEF(EX_VAR(opline->result.var));
Z_FE_ITER_P(EX_VAR(opline->result.var)) = (uint32_t)-1;
@ -39501,7 +39501,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_STRLEN_SPEC_CV_HANDLER(ZEND_OP
zval_ptr_dtor(&tmp);
}
if (!EG(exception)) {
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_value_name(value));
}
ZVAL_UNDEF(EX_VAR(opline->result.var));
} while (0);
@ -39558,7 +39558,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_CV_HANDL
if (UNEXPECTED(Z_TYPE_P(op) != IS_OBJECT)) {
ZVAL_DEREF(op);
if (Z_TYPE_P(op) != IS_OBJECT) {
zend_type_error("Cannot use \"::class\" on value of type %s", zend_zval_type_name(op));
zend_type_error("Cannot use \"::class\" on %s", zend_zval_value_name(op));
ZVAL_UNDEF(EX_VAR(opline->result.var));
HANDLE_EXCEPTION();
@ -48791,7 +48791,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CV_UNUSED_HANDLER(Z
ZVAL_UNDEFINED_OP1();
}
count = 0;
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_value_name(op1));
break;
}
@ -48829,7 +48829,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GET_CLASS_SPEC_CV_UNUSED_HANDL
if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
ZVAL_UNDEFINED_OP1();
}
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_type_name(op1));
zend_type_error("get_class(): Argument #1 ($object) must be of type object, %s given", zend_zval_value_name(op1));
ZVAL_UNDEF(EX_VAR(opline->result.var));
}
break;

2
ext/bz2/bz2.c
View file

@ -404,7 +404,7 @@ PHP_FUNCTION(bzopen)
stream = php_stream_bz2open_from_BZFILE(bz, mode, stream);
} else {
zend_argument_type_error(1, "must be of type string or file-resource, %s given", zend_zval_type_name(file));
zend_argument_type_error(1, "must be of type string or file-resource, %s given", zend_zval_value_name(file));
RETURN_THROWS();
}

4
ext/bz2/tests/002.phpt
View file

@ -91,10 +91,10 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
Warning: fopen(bz_open_002.txt): Failed to open stream: `br' is not a valid mode for fopen in %s on line %d
bzopen(): Argument #1 ($file) must be of type string or file-resource, bool given
bzopen(): Argument #1 ($file) must be of type string or file-resource, false given
Warning: fopen(bz_open_002.txt): Failed to open stream: `br' is not a valid mode for fopen in %s on line %d
bzopen(): Argument #1 ($file) must be of type string or file-resource, bool given
bzopen(): Argument #1 ($file) must be of type string or file-resource, false given
Warning: bzopen(): cannot write to a stream opened in read only mode in %s on line %d
bool(false)

2
ext/dom/node.c
View file

@ -1591,7 +1591,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
}
if (Z_TYPE_P(tmp) != IS_STRING) {
/* if mode == 0 then $xpath arg is 3, if mode == 1 then $xpath is 4 */
zend_argument_type_error(3 + mode, "\"query\" option must be a string, %s given", zend_zval_type_name(tmp));
zend_argument_type_error(3 + mode, "\"query\" option must be a string, %s given", zend_zval_value_name(tmp));
RETURN_THROWS();
}
xquery = Z_STRVAL_P(tmp);

4
ext/dom/parentnode.c
View file

@ -192,7 +192,7 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
} else {
xmlFree(fragment);
zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodes[i]));
zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_value_name(&nodes[i]));
return NULL;
}
} else if (Z_TYPE(nodes[i]) == IS_STRING) {
@ -208,7 +208,7 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
} else {
xmlFree(fragment);
zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodes[i]));
zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_value_name(&nodes[i]));
return NULL;
}

4
ext/ffi/ffi.c
View file

@ -1687,7 +1687,7 @@ static ZEND_COLD void zend_ffi_pass_incompatible(zval *arg, zend_ffi_type *type,
zend_throw_error(zend_ffi_exception_ce, "Passing incompatible argument %d of C function '%s', expecting '%s', found '%s'", n + 1, ZSTR_VAL(EX(func)->internal_function.function_name), buf1.start, buf2.start);
}
} else {
zend_throw_error(zend_ffi_exception_ce, "Passing incompatible argument %d of C function '%s', expecting '%s', found PHP '%s'", n + 1, ZSTR_VAL(EX(func)->internal_function.function_name), buf1.start, zend_zval_type_name(arg));
zend_throw_error(zend_ffi_exception_ce, "Passing incompatible argument %d of C function '%s', expecting '%s', found PHP '%s'", n + 1, ZSTR_VAL(EX(func)->internal_function.function_name), buf1.start, zend_zval_value_name(arg));
}
}
}
@ -1714,7 +1714,7 @@ static ZEND_COLD void zend_ffi_assign_incompatible(zval *arg, zend_ffi_type *typ
zend_throw_error(zend_ffi_exception_ce, "Incompatible types when assigning to type '%s' from type '%s'", buf1.start, buf2.start);
}
} else {
zend_throw_error(zend_ffi_exception_ce, "Incompatible types when assigning to type '%s' from PHP '%s'", buf1.start, zend_zval_type_name(arg));
zend_throw_error(zend_ffi_exception_ce, "Incompatible types when assigning to type '%s' from PHP '%s'", buf1.start, zend_zval_value_name(arg));
}
}
}

2
ext/fileinfo/fileinfo.c
View file

@ -314,7 +314,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
break;
default:
zend_argument_type_error(1, "must be of type resource|string, %s given", zend_zval_type_name(what));
zend_argument_type_error(1, "must be of type resource|string, %s given", zend_zval_value_name(what));
RETURN_THROWS();
}

6
ext/ftp/php_ftp.c
View file

@ -1247,7 +1247,7 @@ PHP_FUNCTION(ftp_set_option)
switch (option) {
case PHP_FTP_OPT_TIMEOUT_SEC:
if (Z_TYPE_P(z_value) != IS_LONG) {
zend_argument_type_error(3, "must be of type int for the FTP_TIMEOUT_SEC option, %s given", zend_zval_type_name(z_value));
zend_argument_type_error(3, "must be of type int for the FTP_TIMEOUT_SEC option, %s given", zend_zval_value_name(z_value));
RETURN_THROWS();
}
if (Z_LVAL_P(z_value) <= 0) {
@ -1259,7 +1259,7 @@ PHP_FUNCTION(ftp_set_option)
break;
case PHP_FTP_OPT_AUTOSEEK:
if (Z_TYPE_P(z_value) != IS_TRUE && Z_TYPE_P(z_value) != IS_FALSE) {
zend_argument_type_error(3, "must be of type bool for the FTP_AUTOSEEK option, %s given", zend_zval_type_name(z_value));
zend_argument_type_error(3, "must be of type bool for the FTP_AUTOSEEK option, %s given", zend_zval_value_name(z_value));
RETURN_THROWS();
}
ftp->autoseek = Z_TYPE_P(z_value) == IS_TRUE ? 1 : 0;
@ -1267,7 +1267,7 @@ PHP_FUNCTION(ftp_set_option)
break;
case PHP_FTP_OPT_USEPASVADDRESS:
if (Z_TYPE_P(z_value) != IS_TRUE && Z_TYPE_P(z_value) != IS_FALSE) {
zend_argument_type_error(3, "must be of type bool for the FTP_USEPASVADDRESS option, %s given", zend_zval_type_name(z_value));
zend_argument_type_error(3, "must be of type bool for the FTP_USEPASVADDRESS option, %s given", zend_zval_value_name(z_value));
RETURN_THROWS();
}
ftp->usepasvaddress = Z_TYPE_P(z_value) == IS_TRUE ? 1 : 0;

2
ext/gd/gd.c
View file

@ -4040,7 +4040,7 @@ static gdIOCtx *create_stream_context_from_zval(zval *to_zval) {
return NULL;
}
} else {
zend_argument_type_error(2, "must be a file name or a stream resource, %s given", zend_zval_type_name(to_zval));
zend_argument_type_error(2, "must be a file name or a stream resource, %s given", zend_zval_value_name(to_zval));
return NULL;
}

4
ext/gmp/gmp.c
View file

@ -624,10 +624,10 @@ static zend_result convert_to_gmp(mpz_t gmpnumber, zval *val, zend_long base, ui
if (!zend_parse_arg_long_slow(val, &lval, arg_pos)) {
if (arg_pos == 0) {
zend_type_error(
"Number must be of type GMP|string|int, %s given", zend_zval_type_name(val));
"Number must be of type GMP|string|int, %s given", zend_zval_value_name(val));
} else {
zend_argument_type_error(arg_pos,
"must be of type GMP|string|int, %s given", zend_zval_type_name(val));
"must be of type GMP|string|int, %s given", zend_zval_value_name(val));
}
return FAILURE;
}

4
ext/gmp/tests/gmp_strict_types.phpt
View file

@ -51,7 +51,7 @@ object(GMP)#2 (1) {
string(1) "1"
}
gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, float given
gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, bool given
gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, bool given
gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, false given
gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, true given
gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, null given
gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, array given

4
ext/hash/hash.c
View file

@ -1119,12 +1119,12 @@ PHP_FUNCTION(hash_equals)
/* We only allow comparing string to prevent unexpected results. */
if (Z_TYPE_P(known_zval) != IS_STRING) {
zend_argument_type_error(1, "must be of type string, %s given", zend_zval_type_name(known_zval));
zend_argument_type_error(1, "must be of type string, %s given", zend_zval_value_name(known_zval));
RETURN_THROWS();
}
if (Z_TYPE_P(user_zval) != IS_STRING) {
zend_argument_type_error(2, "must be of type string, %s given", zend_zval_type_name(user_zval));
zend_argument_type_error(2, "must be of type string, %s given", zend_zval_value_name(user_zval));
RETURN_THROWS();
}

2
ext/imap/php_imap.c
View file

@ -3007,7 +3007,7 @@ PHP_FUNCTION(imap_mail_compose)
if (Z_TYPE_P(data) != IS_ARRAY) {
zend_argument_type_error(2, "individual body must be of type array, %s given",
zend_zval_type_name(data));
zend_zval_value_name(data));
goto done;
}
if (zend_hash_num_elements(Z_ARRVAL_P(data)) == 0) {

10
ext/ldap/ldap.c
View file

@ -1602,7 +1602,7 @@ cleanup_parallel:
result->result = ldap_res;
}
} else {
zend_argument_type_error(1, "must be of type LDAP|array, %s given", zend_zval_type_name(link));
zend_argument_type_error(1, "must be of type LDAP|array, %s given", zend_zval_value_name(link));
}
cleanup:
@ -2568,7 +2568,7 @@ PHP_FUNCTION(ldap_modify_batch)
/* does the value type match the key? */
if (_ldap_str_equal_to_const(ZSTR_VAL(modkey), ZSTR_LEN(modkey), LDAP_MODIFY_BATCH_ATTRIB)) {
if (Z_TYPE_P(modinfo) != IS_STRING) {
zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_ATTRIB "\" must be of type string, %s given", get_active_function_name(), zend_zval_type_name(modinfo));
zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_ATTRIB "\" must be of type string, %s given", get_active_function_name(), zend_zval_value_name(modinfo));
RETURN_THROWS();
}
@ -2579,7 +2579,7 @@ PHP_FUNCTION(ldap_modify_batch)
}
else if (_ldap_str_equal_to_const(ZSTR_VAL(modkey), ZSTR_LEN(modkey), LDAP_MODIFY_BATCH_MODTYPE)) {
if (Z_TYPE_P(modinfo) != IS_LONG) {
zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_MODTYPE "\" must be of type int, %s given", get_active_function_name(), zend_zval_type_name(modinfo));
zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_MODTYPE "\" must be of type int, %s given", get_active_function_name(), zend_zval_value_name(modinfo));
RETURN_THROWS();
}
@ -2611,7 +2611,7 @@ PHP_FUNCTION(ldap_modify_batch)
}
else if (_ldap_str_equal_to_const(ZSTR_VAL(modkey), ZSTR_LEN(modkey), LDAP_MODIFY_BATCH_VALUES)) {
if (Z_TYPE_P(modinfo) != IS_ARRAY) {
zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" must be of type array, %s given", get_active_function_name(), zend_zval_type_name(modinfo));
zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_VALUES "\" must be of type array, %s given", get_active_function_name(), zend_zval_value_name(modinfo));
RETURN_THROWS();
}
@ -3200,7 +3200,7 @@ PHP_FUNCTION(ldap_set_option)
int rc;
if (Z_TYPE_P(newval) != IS_ARRAY) {
zend_argument_type_error(3, "must be of type array for the LDAP_OPT_CLIENT_CONTROLS option, %s given", zend_zval_type_name(newval));
zend_argument_type_error(3, "must be of type array for the LDAP_OPT_CLIENT_CONTROLS option, %s given", zend_zval_value_name(newval));
RETURN_THROWS();
}

8
ext/mbstring/tests/mb_substitute_character_variation_strict_types.phpt
View file

@ -139,13 +139,13 @@ int(12345)
--lowercase null--
int(12345)
--lowercase true--
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, bool given
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, true given
--lowercase false--
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, bool given
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, false given
--uppercase TRUE--
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, bool given
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, true given
--uppercase FALSE--
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, bool given
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, false given
--empty string DQ--
ValueError: mb_substitute_character(): Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint
--empty string SQ--

2
ext/mysqli/mysqli_nonapi.c
View file

@ -650,7 +650,7 @@ static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_ar
i++;
if (Z_TYPE_P(elem) != IS_OBJECT ||
!instanceof_function(Z_OBJCE_P(elem), mysqli_link_class_entry)) {
zend_argument_type_error(i, "must be an instance of mysqli, %s given", zend_zval_type_name(elem));
zend_argument_type_error(i, "must be an instance of mysqli, %s given", zend_zval_value_name(elem));
return FAILURE;
} else {
MY_MYSQL *mysql;

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

@ -27,7 +27,7 @@ $DB->query_single('SELECT DATE()');
?>
--EXPECTF--
Fatal error: Uncaught Error: Call to a member function fetch_row() on bool in %sbug33491.php:%d
Fatal error: Uncaught Error: Call to a member function fetch_row() on false in %sbug33491.php:%d
Stack trace:
#0 %s(%d): DB->query_single('SELECT DATE()')
#1 {main}

14
ext/opcache/jit/zend_jit_helpers.c
View file

@ -34,7 +34,7 @@ static ZEND_COLD void zend_jit_illegal_offset(void)
static ZEND_COLD void zend_jit_illegal_string_offset(zval *offset)
{
zend_type_error("Cannot access offset of type %s on string", zend_zval_type_name(offset));
zend_type_error("Cannot access offset of type %s on string", zend_zval_value_name(offset));
}
static zend_never_inline zend_function* ZEND_FASTCALL _zend_jit_init_func_run_time_cache(zend_op_array *op_array) /* {{{ */
@ -112,7 +112,7 @@ static ZEND_COLD void ZEND_FASTCALL zend_jit_invalid_method_call(zval *object)
object = &EG(uninitialized_zval);
}
zend_throw_error(NULL, "Call to a member function %s() on %s",
Z_STRVAL_P(function_name), zend_zval_type_name(object));
Z_STRVAL_P(function_name), zend_zval_value_name(object));
}
static ZEND_COLD void ZEND_FASTCALL zend_jit_invalid_method_call_tmp(zval *object)
@ -2343,19 +2343,19 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg)
static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
{
zend_error(E_WARNING, "Trying to access array offset on value of type %s", zend_zval_type_name(container));
zend_error(E_WARNING, "Trying to access array offset on %s", zend_zval_value_name(container));
}
static void ZEND_FASTCALL zend_jit_invalid_property_read(zval *container, const char *property_name)
{
zend_error(E_WARNING, "Attempt to read property \"%s\" on %s", property_name, zend_zval_type_name(container));
zend_error(E_WARNING, "Attempt to read property \"%s\" on %s", property_name, zend_zval_value_name(container));
}
static void ZEND_FASTCALL zend_jit_invalid_property_write(zval *container, const char *property_name)
{
zend_throw_error(NULL,
"Attempt to modify property \"%s\" on %s",
property_name, zend_zval_type_name(container));
property_name, zend_zval_value_name(container));
}
static void ZEND_FASTCALL zend_jit_invalid_property_incdec(zval *container, const char *property_name)
@ -2373,7 +2373,7 @@ static void ZEND_FASTCALL zend_jit_invalid_property_incdec(zval *container, cons
}
zend_throw_error(NULL,
"Attempt to increment/decrement property \"%s\" on %s",
property_name, zend_zval_type_name(container));
property_name, zend_zval_value_name(container));
if (opline->op1_type == IS_VAR) {
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
}
@ -2383,7 +2383,7 @@ static void ZEND_FASTCALL zend_jit_invalid_property_assign(zval *container, cons
{
zend_throw_error(NULL,
"Attempt to assign property \"%s\" on %s",
property_name, zend_zval_type_name(container));
property_name, zend_zval_value_name(container));
}
static void ZEND_FASTCALL zend_jit_invalid_property_assign_op(zval *container, const char *property_name)

2
ext/opcache/tests/jit/bw_not_002.phpt
View file

@ -17,7 +17,7 @@ function test() {
test();
?>
--EXPECTF--
Fatal error: Uncaught TypeError: Cannot perform bitwise not on bool in %sbw_not_002.php:5
Fatal error: Uncaught TypeError: Cannot perform bitwise not on true in %sbw_not_002.php:5
Stack trace:
#0 %sbw_not_002.php(8): test()
#1 {main}

2
ext/opcache/tests/jit/fetch_dim_func_arg_002.phpt
View file

@ -14,5 +14,5 @@ new class(true[""]) {
?>
DONE
--EXPECTF--
Warning: Trying to access array offset on value of type bool in %sfetch_dim_func_arg_002.php on line 2
Warning: Trying to access array offset on true in %sfetch_dim_func_arg_002.php on line 2
DONE

2
ext/opcache/tests/jit/fetch_dim_r_008.phpt
View file

@ -12,5 +12,5 @@ test()[1];
?>
DONE
--EXPECTF--
Warning: Trying to access array offset on value of type null in %sfetch_dim_r_008.php on line 3
Warning: Trying to access array offset on null in %sfetch_dim_r_008.php on line 3
DONE

6
ext/openssl/tests/openssl_pkey_new_error.phpt
View file

@ -28,6 +28,6 @@ try {
}
?>
--EXPECT--
openssl_pkey_get_details(): Argument #1 ($key) must be of type OpenSSLAsymmetricKey, bool given
openssl_pkey_get_details(): Argument #1 ($key) must be of type OpenSSLAsymmetricKey, bool given
openssl_pkey_get_details(): Argument #1 ($key) must be of type OpenSSLAsymmetricKey, bool given
openssl_pkey_get_details(): Argument #1 ($key) must be of type OpenSSLAsymmetricKey, false given
openssl_pkey_get_details(): Argument #1 ($key) must be of type OpenSSLAsymmetricKey, false given
openssl_pkey_get_details(): Argument #1 ($key) must be of type OpenSSLAsymmetricKey, false given

2
ext/pcntl/pcntl.c
View file

@ -654,7 +654,7 @@ PHP_FUNCTION(pcntl_signal)
zend_string *func_name = zend_get_callable_name(handle);
PCNTL_G(last_error) = EINVAL;
zend_argument_type_error(2, "must be of type callable|int, %s given", zend_zval_type_name(handle));
zend_argument_type_error(2, "must be of type callable|int, %s given", zend_zval_value_name(handle));
zend_string_release_ex(func_name, 0);
efree(error);
RETURN_THROWS();

12
ext/pdo/pdo_dbh.c
View file

@ -521,7 +521,7 @@ PHP_METHOD(PDO, prepare)
if (options && (value = zend_hash_index_find(Z_ARRVAL_P(options), PDO_ATTR_STATEMENT_CLASS)) != NULL) {
if (Z_TYPE_P(value) != IS_ARRAY) {
zend_type_error("PDO::ATTR_STATEMENT_CLASS value must be of type array, %s given",
zend_zval_type_name(value));
zend_zval_value_name(value));
RETURN_THROWS();
}
if ((item = zend_hash_index_find(Z_ARRVAL_P(value), 0)) == NULL) {
@ -545,7 +545,7 @@ PHP_METHOD(PDO, prepare)
if ((item = zend_hash_index_find(Z_ARRVAL_P(value), 1)) != NULL) {
if (Z_TYPE_P(item) != IS_ARRAY) {
zend_type_error("PDO::ATTR_STATEMENT_CLASS constructor_args must be of type ?array, %s given",
zend_zval_type_name(value));
zend_zval_value_name(value));
RETURN_THROWS();
}
ZVAL_COPY_VALUE(&ctor_args, item);
@ -698,7 +698,7 @@ PDO_API bool pdo_get_long_param(zend_long *lval, zval *value)
}
ZEND_FALLTHROUGH;
default:
zend_type_error("Attribute value must be of type int for selected attribute, %s given", zend_zval_type_name(value));
zend_type_error("Attribute value must be of type int for selected attribute, %s given", zend_zval_value_name(value));
return false;
}
}
@ -716,7 +716,7 @@ PDO_API bool pdo_get_bool_param(bool *bval, zval *value)
return true;
case IS_STRING: /* TODO Should string be allowed? */
default:
zend_type_error("Attribute value must be of type bool for selected attribute, %s given", zend_zval_type_name(value));
zend_type_error("Attribute value must be of type bool for selected attribute, %s given", zend_zval_value_name(value));
return false;
}
}
@ -812,7 +812,7 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
}
if (Z_TYPE_P(value) != IS_ARRAY) {
zend_type_error("PDO::ATTR_STATEMENT_CLASS value must be of type array, %s given",
zend_zval_type_name(value));
zend_zval_value_name(value));
return false;
}
if ((item = zend_hash_index_find(Z_ARRVAL_P(value), 0)) == NULL) {
@ -840,7 +840,7 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
if ((item = zend_hash_index_find(Z_ARRVAL_P(value), 1)) != NULL) {
if (Z_TYPE_P(item) != IS_ARRAY) {
zend_type_error("PDO::ATTR_STATEMENT_CLASS constructor_args must be of type ?array, %s given",
zend_zval_type_name(value));
zend_zval_value_name(value));
return false;
}
ZVAL_COPY(&dbh->def_stmt_ctor_args, item);

12
ext/pdo/pdo_stmt.c
View file

@ -1280,7 +1280,7 @@ PHP_METHOD(PDOStatement, fetchAll)
/* Figure out correct class */
if (arg2) {
if (Z_TYPE_P(arg2) != IS_STRING) {
zend_argument_type_error(2, "must be of type string, %s given", zend_zval_type_name(arg2));
zend_argument_type_error(2, "must be of type string, %s given", zend_zval_value_name(arg2));
RETURN_THROWS();
}
stmt->fetch.cls.ce = zend_fetch_class(Z_STR_P(arg2), ZEND_FETCH_CLASS_AUTO);
@ -1333,7 +1333,7 @@ PHP_METHOD(PDOStatement, fetchAll)
if (arg2) {
// Reuse convert_to_long(arg2); ?
if (Z_TYPE_P(arg2) != IS_LONG) {
zend_argument_type_error(2, "must be of type int, %s given", zend_zval_type_name(arg2));
zend_argument_type_error(2, "must be of type int, %s given", zend_zval_value_name(arg2));
RETURN_THROWS();
}
if (Z_LVAL_P(arg2) < 0) {
@ -1752,7 +1752,7 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
return false;
}
if (Z_TYPE(args[0]) != IS_LONG) {
zend_argument_type_error(arg1_arg_num, "must be of type int, %s given", zend_zval_type_name(&args[0]));
zend_argument_type_error(arg1_arg_num, "must be of type int, %s given", zend_zval_value_name(&args[0]));
return false;
}
if (Z_LVAL(args[0]) < 0) {
@ -1794,7 +1794,7 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
return false;
}
if (Z_TYPE(args[0]) != IS_STRING) {
zend_argument_type_error(arg1_arg_num, "must be of type string, %s given", zend_zval_type_name(&args[0]));
zend_argument_type_error(arg1_arg_num, "must be of type string, %s given", zend_zval_value_name(&args[0]));
return false;
}
cep = zend_lookup_class(Z_STR(args[0]));
@ -1807,7 +1807,7 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
if (variadic_num_args == 2) {
if (Z_TYPE(args[1]) != IS_NULL && Z_TYPE(args[1]) != IS_ARRAY) {
zend_argument_type_error(constructor_arg_num, "must be of type ?array, %s given",
zend_zval_type_name(&args[1]));
zend_zval_value_name(&args[1]));
return false;
}
if (Z_TYPE(args[1]) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL(args[1]))) {
@ -1834,7 +1834,7 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
return false;
}
if (Z_TYPE(args[0]) != IS_OBJECT) {
zend_argument_type_error(arg1_arg_num, "must be of type object, %s given", zend_zval_type_name(&args[0]));
zend_argument_type_error(arg1_arg_num, "must be of type object, %s given", zend_zval_value_name(&args[0]));
return false;
}

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

@ -62,5 +62,5 @@ object(PDORow)#5 (2) {
string(19) "SELECT id FROM test"
----------------------------------
Warning: Attempt to read property "queryString" on bool in %s on line %d
Warning: Attempt to read property "queryString" on false in %s on line %d
NULL

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

@ -95,7 +95,7 @@ array(1) {
Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d
Fatal error: Uncaught Error: Call to a member function execute() on bool in %s:%d
Fatal error: Uncaught Error: Call to a member function execute() on false in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d

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

@ -37,7 +37,7 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named
Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d
Fatal error: Uncaught Error: Call to a member function execute() on bool in %s:%d
Fatal error: Uncaught Error: Call to a member function execute() on false in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d

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

@ -57,7 +57,7 @@ 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
Fatal error: Uncaught Error: Call to a member function execute() on bool in %s:%d
Fatal error: Uncaught Error: Call to a member function execute() on false in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d

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

@ -100,7 +100,7 @@ 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
Fatal error: Uncaught Error: Call to a member function errorInfo() on bool in %s:%d
Fatal error: Uncaught Error: Call to a member function errorInfo() on false in %s:%d
Stack trace:
#0 %s(%d): mysql_stmt_multiquery_wrong_usage(Object(PDO))
#1 {main}

10
ext/pgsql/pgsql.c
View file

@ -2228,7 +2228,7 @@ PHP_FUNCTION(pg_lo_create)
wanted_oid = (Oid)Z_LVAL_P(oid);
break;
default:
zend_type_error("OID value must be of type string|int, %s given", zend_zval_type_name(oid));
zend_type_error("OID value must be of type string|int, %s given", zend_zval_value_name(oid));
RETURN_THROWS();
}
if ((pgsql_oid = lo_create(pgsql, wanted_oid)) == InvalidOid) {
@ -2599,7 +2599,7 @@ PHP_FUNCTION(pg_lo_import)
wanted_oid = (Oid)Z_LVAL_P(oid);
break;
default:
zend_type_error("OID value must be of type string|int, %s given", zend_zval_type_name(oid));
zend_type_error("OID value must be of type string|int, %s given", zend_zval_value_name(oid));
RETURN_THROWS();
}
@ -4489,7 +4489,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const zend_string *
err = 1;
}
if (!err && (Z_TYPE_P(val) == IS_ARRAY || Z_TYPE_P(val) == IS_OBJECT || Z_TYPE_P(val) == IS_RESOURCE)) {
zend_type_error("Values must be of type string|int|float|bool|null, %s given", zend_zval_type_name(val));
zend_type_error("Values must be of type string|int|float|bool|null, %s given", zend_zval_value_name(val));
err = 1;
}
if (err) {
@ -5253,7 +5253,7 @@ PHP_PGSQL_API zend_result php_pgsql_insert(PGconn *pg_link, const zend_string *t
smart_str_appendl(&querystr, "NULL", sizeof("NULL")-1);
break;
default:
zend_type_error("Value must be of type string|int|float|null, %s given", zend_zval_type_name(val));
zend_type_error("Value must be of type string|int|float|null, %s given", zend_zval_value_name(val));
goto cleanup;
}
smart_str_appendc(&querystr, ',');
@ -5427,7 +5427,7 @@ static inline int build_assignment_string(PGconn *pg_link, smart_str *querystr,
smart_str_appendl(querystr, "NULL", sizeof("NULL")-1);
break;
default:
zend_type_error("Value must be of type string|int|float|null, %s given", zend_zval_type_name(val));
zend_type_error("Value must be of type string|int|float|null, %s given", zend_zval_value_name(val));
return -1;
}
smart_str_appendl(querystr, pad, pad_len);

2
ext/pgsql/tests/28large_object_import_oid.phpt
View file

@ -104,7 +104,7 @@ Invalid OID value passed
Invalid OID value passed
Deprecated: pg_lo_import(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
OID value must be of type string|int, bool given
OID value must be of type string|int, true given
OID value must be of type string|int, array given
OID value must be of type string|int, stdClass given
OID value must be of type string|int, PgSql\Connection given

6
ext/posix/posix.c
View file

@ -460,7 +460,7 @@ PHP_FUNCTION(posix_ttyname)
} else {
if (!zend_parse_arg_long(z_fd, &fd, /* is_null */ false, /* check_null */ false, /* arg_num */ 1)) {
php_error_docref(NULL, E_WARNING, "Argument #1 ($file_descriptor) must be of type int|resource, %s given",
zend_zval_type_name(z_fd));
zend_zval_value_name(z_fd));
fd = zval_get_long(z_fd);
}
/* fd must fit in an int and be positive */
@ -510,7 +510,7 @@ PHP_FUNCTION(posix_isatty)
} else {
if (!zend_parse_arg_long(z_fd, &fd, /* is_null */ false, /* check_null */ false, /* arg_num */ 1)) {
php_error_docref(NULL, E_WARNING, "Argument #1 ($file_descriptor) must be of type int|resource, %s given",
zend_zval_type_name(z_fd));
zend_zval_value_name(z_fd));
fd = zval_get_long(z_fd);
}
}
@ -1243,7 +1243,7 @@ PHP_FUNCTION(posix_fpathconf)
} else {
if (!zend_parse_arg_long(z_fd, &fd, /* is_null */ false, /* check_null */ false, /* arg_num */ 1)) {
zend_argument_type_error(1, "must be of type int|resource, %s given",
zend_zval_type_name(z_fd));
zend_zval_value_name(z_fd));
RETURN_THROWS();
}
}

2
ext/pspell/tests/003.phpt
View file

@ -35,7 +35,7 @@ var_dump(pspell_config_ignore($cfg, PHP_INT_MAX));
bool(false)
Warning: pspell_new_config(): PSPELL couldn't open the dictionary. reason: The encoding "b0rked" is not known. This could also mean that the file "%sb0rked.%s" could not be opened for reading or does not exist. in %s003.php on line 9
pspell_check(): Argument #1 ($dictionary) must be of type PSpell\Dictionary, bool given
pspell_check(): Argument #1 ($dictionary) must be of type PSpell\Dictionary, false given
---
bool(true)
bool(true)

2
ext/reflection/php_reflection.c
View file

@ -2493,7 +2493,7 @@ ZEND_METHOD(ReflectionParameter, __construct)
break;
default:
zend_argument_error(reflection_exception_ptr, 1, "must be a string, an array(class, method), or a callable object, %s given", zend_zval_type_name(reference));
zend_argument_error(reflection_exception_ptr, 1, "must be a string, an array(class, method), or a callable object, %s given", zend_zval_value_name(reference));
RETURN_THROWS();
}

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

@ -24,4 +24,4 @@ try {
?>
--EXPECT--
string(85) "ReflectionMethod::invokeArgs(): Argument #2 ($args) must be of type array, bool given"
string(85) "ReflectionMethod::invokeArgs(): Argument #2 ($args) must be of type array, true given"

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

@ -103,7 +103,7 @@ NULL
Static method:
ReflectionMethod::invoke() expects at least 1 argument, 0 given
ReflectionMethod::invoke(): Argument #1 ($object) must be of type ?object, bool given
ReflectionMethod::invoke(): Argument #1 ($object) must be of type ?object, true given
Called staticMethod()
Exception: Using $this when not in object context
NULL

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

@ -55,7 +55,7 @@ try {
?>
--EXPECT--
invoke() on a non-object:
string(85) "ReflectionMethod::invoke(): Argument #1 ($object) must be of type ?object, bool given"
string(85) "ReflectionMethod::invoke(): Argument #1 ($object) must be of type ?object, true given"
invoke() on a non-instance:
string(72) "Given object is not an instance of the class this method was declared in"

6
ext/session/mod_user.c
View file

@ -62,19 +62,19 @@ static zend_result verify_bool_return_type_userland_calls(const zval* value)
if ((Z_TYPE_P(value) == IS_LONG) && (Z_LVAL_P(value) == -1)) {
/* TODO Why are exception cheked? */
if (!EG(exception)) {
php_error_docref(NULL, E_DEPRECATED, "Session callback must have a return value of type bool, %s returned", zend_zval_type_name(value));
php_error_docref(NULL, E_DEPRECATED, "Session callback must have a return value of type bool, %s returned", zend_zval_value_name(value));
}
return FAILURE;
}
if ((Z_TYPE_P(value) == IS_LONG) && (Z_LVAL_P(value) == 0)) {
/* TODO Why are exception cheked? */
if (!EG(exception)) {
php_error_docref(NULL, E_DEPRECATED, "Session callback must have a return value of type bool, %s returned", zend_zval_type_name(value));
php_error_docref(NULL, E_DEPRECATED, "Session callback must have a return value of type bool, %s returned", zend_zval_value_name(value));
}
return SUCCESS;
}
if (!EG(exception)) {
zend_type_error("Session callback must have a return value of type bool, %s returned", zend_zval_type_name(value)); \
zend_type_error("Session callback must have a return value of type bool, %s returned", zend_zval_value_name(value)); \
}
return FAILURE;
}

2
ext/session/session.c
View file

@ -2553,7 +2553,7 @@ PHP_FUNCTION(session_start)
break;
default:
zend_type_error("%s(): Option \"%s\" must be of type string|int|bool, %s given",
get_active_function_name(), ZSTR_VAL(str_idx), zend_zval_type_name(value)
get_active_function_name(), ZSTR_VAL(str_idx), zend_zval_value_name(value)
);
RETURN_THROWS();
}

4
ext/simplexml/simplexml.c
View file

@ -496,7 +496,7 @@ long_dim:
if (member == &tmp_zv) {
zval_ptr_dtor_str(&tmp_zv);
}
zend_type_error("It's not possible to assign a complex type to %s, %s given", attribs ? "attributes" : "properties", zend_zval_type_name(value));
zend_type_error("It's not possible to assign a complex type to %s, %s given", attribs ? "attributes" : "properties", zend_zval_value_name(value));
return &EG(error_zval);
}
}
@ -2605,7 +2605,7 @@ PHP_FUNCTION(simplexml_import_dom)
nodep = php_libxml_import_node(node);
if (!nodep) {
zend_argument_type_error(1, "must be of type SimpleXMLElement|DOMNode, %s given", zend_zval_type_name(node));
zend_argument_type_error(1, "must be of type SimpleXMLElement|DOMNode, %s given", zend_zval_value_name(node));
RETURN_THROWS();
}

8
ext/soap/soap.c
View file

@ -667,7 +667,7 @@ static HashTable* soap_create_typemap(sdlPtr sdl, HashTable *ht) /* {{{ */
zend_string *name;
if (Z_TYPE_P(tmp) != IS_ARRAY) {
zend_type_error("SoapHeader::__construct(): \"typemap\" option must be of type array, %s given", zend_zval_type_name(tmp));
zend_type_error("SoapHeader::__construct(): \"typemap\" option must be of type array, %s given", zend_zval_value_name(tmp));
return NULL;
}
ht2 = Z_ARRVAL_P(tmp);
@ -1089,7 +1089,7 @@ PHP_METHOD(SoapServer, addFunction)
RETURN_THROWS();
}
} else {
zend_argument_type_error(1, "must be of type array|string|int, %s given", zend_zval_type_name(function_name));
zend_argument_type_error(1, "must be of type array|string|int, %s given", zend_zval_value_name(function_name));
RETURN_THROWS();
}
@ -2414,7 +2414,7 @@ void soap_client_call_impl(INTERNAL_FUNCTION_PARAMETERS, bool is_soap_call)
Z_ADDREF_P(headers);
free_soap_headers = 1;
} else {
zend_argument_type_error(4, "must be of type SoapHeader|array|null, %s given", zend_zval_type_name(headers));
zend_argument_type_error(4, "must be of type SoapHeader|array|null, %s given", zend_zval_value_name(headers));
RETURN_THROWS();
}
@ -2678,7 +2678,7 @@ PHP_METHOD(SoapClient, __setSoapHeaders)
zval_ptr_dtor(Z_CLIENT_DEFAULT_HEADERS_P(this_ptr));
ZVAL_COPY_VALUE(Z_CLIENT_DEFAULT_HEADERS_P(this_ptr), &default_headers);
} else {
zend_argument_type_error(1, "must be of type SoapHeader|array|null, %s given", zend_zval_type_name(headers));
zend_argument_type_error(1, "must be of type SoapHeader|array|null, %s given", zend_zval_value_name(headers));
RETURN_THROWS();
}
RETURN_TRUE;

2
ext/sockets/sockets.c
View file

@ -505,7 +505,7 @@ static int php_sock_array_to_fd_set(uint32_t arg_num, zval *sock_array, fd_set *
ZVAL_DEREF(element);
if (Z_TYPE_P(element) != IS_OBJECT || Z_OBJCE_P(element) != socket_ce) {
zend_argument_type_error(arg_num, "must only have elements of type Socket, %s given", zend_zval_type_name(element));
zend_argument_type_error(arg_num, "must only have elements of type Socket, %s given", zend_zval_value_name(element));
return -1;
}

6
ext/spl/php_spl.c
View file

@ -79,7 +79,7 @@ PHP_FUNCTION(class_parents)
}
if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(obj));
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_value_name(obj));
RETURN_THROWS();
}
@ -111,7 +111,7 @@ PHP_FUNCTION(class_implements)
RETURN_THROWS();
}
if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(obj));
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_value_name(obj));
RETURN_THROWS();
}
@ -139,7 +139,7 @@ PHP_FUNCTION(class_uses)
RETURN_THROWS();
}
if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(obj));
zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_value_name(obj));
RETURN_THROWS();
}

2
ext/spl/spl_directory.c
View file

@ -1964,7 +1964,7 @@ static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesys
if (Z_TYPE(retval) != IS_STRING) {
zend_type_error("%s::getCurrentLine(): Return value must be of type string, %s returned",
ZSTR_VAL(Z_OBJCE_P(this_ptr)->name), zend_zval_type_name(&retval));
ZSTR_VAL(Z_OBJCE_P(this_ptr)->name), zend_zval_value_name(&retval));
zval_ptr_dtor(&retval);
return FAILURE;
}

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

@ -10,7 +10,7 @@ var_dump($test, $test3['mmmmm']);
--EXPECTF--
Warning: Undefined variable $test3 in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
object(ArrayObject)#1 (1) {
["storage":"ArrayObject":private]=>
array(1) {

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

@ -34,7 +34,7 @@ NULL
Warning: Undefined variable $c in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on null in %s on line %d
NULL
Warning: Undefined array key "epic_magic" in %s on line %d

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

@ -23,5 +23,5 @@ Error at offset 10 of 19 bytes
Warning: unserialize(): Error at offset 22 of 43 bytes in %s on line %d
Warning: Trying to access array offset on value of type bool in %s on line %d
Warning: Trying to access array offset on false in %s on line %d
DONE

8
ext/spl/tests/class_implements_variation1.phpt
View file

@ -158,16 +158,16 @@ class_implements(): Argument #1 ($object_or_class) must be of type object|string
class_implements(): Argument #1 ($object_or_class) must be of type object|string, null given
--lowercase true--
class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_implements(): Argument #1 ($object_or_class) must be of type object|string, true given
--lowercase false--
class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_implements(): Argument #1 ($object_or_class) must be of type object|string, false given
--uppercase TRUE--
class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_implements(): Argument #1 ($object_or_class) must be of type object|string, true given
--uppercase FALSE--
class_implements(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_implements(): Argument #1 ($object_or_class) must be of type object|string, false given
--empty string DQ--
Error: 2 - class_implements(): Class does not exist and could not be loaded, %s(%d)

8
ext/spl/tests/class_uses_variation1.phpt
View file

@ -158,16 +158,16 @@ class_uses(): Argument #1 ($object_or_class) must be of type object|string, null
class_uses(): Argument #1 ($object_or_class) must be of type object|string, null given
--lowercase true--
class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_uses(): Argument #1 ($object_or_class) must be of type object|string, true given
--lowercase false--
class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_uses(): Argument #1 ($object_or_class) must be of type object|string, false given
--uppercase TRUE--
class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_uses(): Argument #1 ($object_or_class) must be of type object|string, true given
--uppercase FALSE--
class_uses(): Argument #1 ($object_or_class) must be of type object|string, bool given
class_uses(): Argument #1 ($object_or_class) must be of type object|string, false given
--empty string DQ--
Error: 2 - class_uses(): Class does not exist and could not be loaded, %s(%d)

34
ext/standard/array.c
View file

@ -670,7 +670,7 @@ PHP_FUNCTION(count)
}
ZEND_FALLTHROUGH;
default:
zend_argument_type_error(1, "must be of type Countable|array, %s given", zend_zval_type_name(array));
zend_argument_type_error(1, "must be of type Countable|array, %s given", zend_zval_value_name(array));
RETURN_THROWS();
}
}
@ -1176,7 +1176,7 @@ PHP_FUNCTION(min)
/* mixed min ( array $values ) */
if (argc == 1) {
if (Z_TYPE(args[0]) != IS_ARRAY) {
zend_argument_type_error(1, "must be of type array, %s given", zend_zval_type_name(&args[0]));
zend_argument_type_error(1, "must be of type array, %s given", zend_zval_value_name(&args[0]));
RETURN_THROWS();
} else {
zval *result = zend_hash_minmax(Z_ARRVAL(args[0]), php_data_compare, 0);
@ -1222,7 +1222,7 @@ PHP_FUNCTION(max)
/* mixed max ( array $values ) */
if (argc == 1) {
if (Z_TYPE(args[0]) != IS_ARRAY) {
zend_argument_type_error(1, "must be of type array, %s given", zend_zval_type_name(&args[0]));
zend_argument_type_error(1, "must be of type array, %s given", zend_zval_value_name(&args[0]));
RETURN_THROWS();
} else {
zval *result = zend_hash_minmax(Z_ARRVAL(args[0]), php_data_compare, 1);
@ -2495,7 +2495,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu
Z_UNPROTECT_RECURSION_P(entry);
}
} else {
php_error_docref(NULL, E_WARNING, "Argument #%d must be string or array of strings, %s given", pos, zend_zval_type_name(entry));
php_error_docref(NULL, E_WARNING, "Argument #%d must be string or array of strings, %s given", pos, zend_zval_value_name(entry));
return;
}
}
@ -3829,7 +3829,7 @@ static zend_always_inline void php_array_replace_wrapper(INTERNAL_FUNCTION_PARAM
zval *arg = args + i;
if (Z_TYPE_P(arg) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(arg));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(arg));
RETURN_THROWS();
}
}
@ -3873,7 +3873,7 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
zval *arg = args + i;
if (Z_TYPE_P(arg) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(arg));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(arg));
RETURN_THROWS();
}
count += zend_hash_num_elements(Z_ARRVAL_P(arg));
@ -4672,7 +4672,7 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa
for (i = 0; i < argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
RETURN_THROWS();
}
}
@ -4820,7 +4820,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
for (i = 0; i < arr_argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
arr_argc = i; /* only free up to i - 1 */
goto out;
}
@ -5057,7 +5057,7 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty
for (i = 0; i < argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
RETURN_THROWS();
}
}
@ -5205,7 +5205,7 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
for (i = 0; i < arr_argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
arr_argc = i; /* only free up to i - 1 */
goto out;
}
@ -5387,7 +5387,7 @@ PHP_FUNCTION(array_diff)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE(args[0]) != IS_ARRAY) {
zend_argument_type_error(1, "must be of type array, %s given", zend_zval_type_name(&args[0]));
zend_argument_type_error(1, "must be of type array, %s given", zend_zval_value_name(&args[0]));
RETURN_THROWS();
}
@ -5395,7 +5395,7 @@ PHP_FUNCTION(array_diff)
if (num == 0) {
for (i = 1; i < argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
RETURN_THROWS();
}
}
@ -5412,7 +5412,7 @@ PHP_FUNCTION(array_diff)
if (!value) {
for (i = 1; i < argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
RETURN_THROWS();
}
}
@ -5423,7 +5423,7 @@ PHP_FUNCTION(array_diff)
for (i = 1; i < argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
RETURN_THROWS();
}
if (!found) {
@ -5453,7 +5453,7 @@ PHP_FUNCTION(array_diff)
num = 0;
for (i = 1; i < argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_type_name(&args[i]));
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
RETURN_THROWS();
}
num += zend_hash_num_elements(Z_ARRVAL(args[i]));
@ -6135,7 +6135,7 @@ PHP_FUNCTION(array_map)
int ret;
if (Z_TYPE(arrays[0]) != IS_ARRAY) {
zend_argument_type_error(2, "must be of type array, %s given", zend_zval_type_name(&arrays[0]));
zend_argument_type_error(2, "must be of type array, %s given", zend_zval_value_name(&arrays[0]));
RETURN_THROWS();
}
maxlen = zend_hash_num_elements(Z_ARRVAL(arrays[0]));
@ -6172,7 +6172,7 @@ PHP_FUNCTION(array_map)
for (i = 0; i < n_arrays; i++) {
if (Z_TYPE(arrays[i]) != IS_ARRAY) {
zend_argument_type_error(i + 2, "must be of type array, %s given", zend_zval_type_name(&arrays[i]));
zend_argument_type_error(i + 2, "must be of type array, %s given", zend_zval_value_name(&arrays[i]));
efree(array_pos);
RETURN_THROWS();
}

4
ext/standard/mail.c
View file

@ -121,7 +121,7 @@ static void php_mail_build_headers_elem(smart_str *s, zend_string *key, zval *va
php_mail_build_headers_elems(s, key, val);
break;
default:
zend_type_error("Header \"%s\" must be of type array|string, %s given", ZSTR_VAL(key), zend_zval_type_name(val));
zend_type_error("Header \"%s\" must be of type array|string, %s given", ZSTR_VAL(key), zend_zval_value_name(val));
}
}
@ -137,7 +137,7 @@ static void php_mail_build_headers_elems(smart_str *s, zend_string *key, zval *v
break;
}
if (Z_TYPE_P(tmp_val) != IS_STRING) {
zend_type_error("Header \"%s\" must only contain values of type string, %s found", ZSTR_VAL(key), zend_zval_type_name(tmp_val));
zend_type_error("Header \"%s\" must only contain values of type string, %s found", ZSTR_VAL(key), zend_zval_value_name(tmp_val));
break;
}
php_mail_build_headers_elem(s, key, tmp_val);

4
ext/standard/php_mail.h
View file

@ -33,7 +33,7 @@ do { \
} \
php_mail_build_headers_elems(&s, key, val); \
} else { \
zend_type_error("Header \"%s\" must be of type array|string, %s given", ZSTR_VAL(key), zend_zval_type_name(val)); \
zend_type_error("Header \"%s\" must be of type array|string, %s given", ZSTR_VAL(key), zend_zval_value_name(val)); \
} \
} while(0)
@ -45,7 +45,7 @@ do { \
} else if (Z_TYPE_P(val) == IS_ARRAY) { \
php_mail_build_headers_elems(&s, key, val); \
} else { \
zend_type_error("Header \"%s\" must be of type array|string, %s given", ZSTR_VAL(key), zend_zval_type_name(val)); \
zend_type_error("Header \"%s\" must be of type array|string, %s given", ZSTR_VAL(key), zend_zval_value_name(val)); \
} \
} while(0)

2
ext/standard/proc_open.c
View file

@ -900,7 +900,7 @@ static zend_result set_proc_descriptor_from_array(zval *descitem, descriptorspec
goto finish;
}
if (Z_TYPE_P(ztarget) != IS_LONG) {
zend_value_error("Redirection target must be of type int, %s given", zend_zval_type_name(ztarget));
zend_value_error("Redirection target must be of type int, %s given", zend_zval_value_name(ztarget));
goto finish;
}

8
ext/standard/tests/array/array_column_scalar_index_strict_types.phpt
View file

@ -47,15 +47,15 @@ try {
DONE
--EXPECT--
-- Testing array_column() column key parameter should be a string or an integer (testing bool) --
array_column(): Argument #2 ($column_key) must be of type string|int|null, bool given
array_column(): Argument #2 ($column_key) must be of type string|int|null, bool given
array_column(): Argument #2 ($column_key) must be of type string|int|null, false given
array_column(): Argument #2 ($column_key) must be of type string|int|null, true given
-- Testing array_column() column key parameter should be a string or integer (testing array) --
array_column(): Argument #2 ($column_key) must be of type string|int|null, array given
-- Testing array_column() index key parameter should be a string or an integer (testing bool) --
array_column(): Argument #3 ($index_key) must be of type string|int|null, bool given
array_column(): Argument #3 ($index_key) must be of type string|int|null, bool given
array_column(): Argument #3 ($index_key) must be of type string|int|null, false given
array_column(): Argument #3 ($index_key) must be of type string|int|null, true given
-- Testing array_column() index key parameter should be a string or integer (testing array) --
array_column(): Argument #3 ($index_key) must be of type string|int|null, array given

8
ext/standard/tests/array/array_diff_assoc_variation1.phpt
View file

@ -133,16 +133,16 @@ array_diff_assoc(): Argument #1 ($array) must be of type array, null given
array_diff_assoc(): Argument #1 ($array) must be of type array, null given
-- Iteration 12 --
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
array_diff_assoc(): Argument #1 ($array) must be of type array, true given
-- Iteration 13 --
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
array_diff_assoc(): Argument #1 ($array) must be of type array, false given
-- Iteration 14 --
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
array_diff_assoc(): Argument #1 ($array) must be of type array, true given
-- Iteration 15 --
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
array_diff_assoc(): Argument #1 ($array) must be of type array, false given
-- Iteration 16 --
array_diff_assoc(): Argument #1 ($array) must be of type array, string given

8
ext/standard/tests/array/array_diff_assoc_variation2.phpt
View file

@ -133,16 +133,16 @@ array_diff_assoc(): Argument #2 must be of type array, null given
array_diff_assoc(): Argument #2 must be of type array, null given
-- Iteration 12 --
array_diff_assoc(): Argument #2 must be of type array, bool given
array_diff_assoc(): Argument #2 must be of type array, true given
-- Iteration 13 --
array_diff_assoc(): Argument #2 must be of type array, bool given
array_diff_assoc(): Argument #2 must be of type array, false given
-- Iteration 14 --
array_diff_assoc(): Argument #2 must be of type array, bool given
array_diff_assoc(): Argument #2 must be of type array, true given
-- Iteration 15 --
array_diff_assoc(): Argument #2 must be of type array, bool given
array_diff_assoc(): Argument #2 must be of type array, false given
-- Iteration 16 --
array_diff_assoc(): Argument #2 must be of type array, string given

16
ext/standard/tests/array/array_diff_key_variation1.phpt
View file

@ -147,20 +147,20 @@ array_diff_key(): Argument #1 ($array) must be of type array, null given
array_diff_key(): Argument #1 ($array) must be of type array, null given
--lowercase true--
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, true given
array_diff_key(): Argument #1 ($array) must be of type array, true given
--lowercase false--
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, false given
array_diff_key(): Argument #1 ($array) must be of type array, false given
--uppercase TRUE--
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, true given
array_diff_key(): Argument #1 ($array) must be of type array, true given
--uppercase FALSE--
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, bool given
array_diff_key(): Argument #1 ($array) must be of type array, false given
array_diff_key(): Argument #1 ($array) must be of type array, false given
--empty string DQ--
array_diff_key(): Argument #1 ($array) must be of type array, string given

16
ext/standard/tests/array/array_diff_key_variation2.phpt
View file

@ -148,20 +148,20 @@ array_diff_key(): Argument #2 must be of type array, null given
array_diff_key(): Argument #2 must be of type array, null given
--lowercase true--
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, true given
array_diff_key(): Argument #2 must be of type array, true given
--lowercase false--
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, false given
array_diff_key(): Argument #2 must be of type array, false given
--uppercase TRUE--
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, true given
array_diff_key(): Argument #2 must be of type array, true given
--uppercase FALSE--
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, bool given
array_diff_key(): Argument #2 must be of type array, false given
array_diff_key(): Argument #2 must be of type array, false given
--empty string DQ--
array_diff_key(): Argument #2 must be of type array, string given

8
ext/standard/tests/array/array_diff_uassoc_variation1.phpt
View file

@ -143,16 +143,16 @@ array_diff_uassoc(): Argument #1 ($array) must be of type array, null given
array_diff_uassoc(): Argument #1 ($array) must be of type array, null given
--lowercase true--
array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
array_diff_uassoc(): Argument #1 ($array) must be of type array, true given
--lowercase false--
array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
array_diff_uassoc(): Argument #1 ($array) must be of type array, false given
--uppercase TRUE--
array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
array_diff_uassoc(): Argument #1 ($array) must be of type array, true given
--uppercase FALSE--
array_diff_uassoc(): Argument #1 ($array) must be of type array, bool given
array_diff_uassoc(): Argument #1 ($array) must be of type array, false given
--empty string DQ--
array_diff_uassoc(): Argument #1 ($array) must be of type array, string given

8
ext/standard/tests/array/array_diff_uassoc_variation2.phpt
View file

@ -143,16 +143,16 @@ array_diff_uassoc(): Argument #2 must be of type array, null given
array_diff_uassoc(): Argument #2 must be of type array, null given
--lowercase true--
array_diff_uassoc(): Argument #2 must be of type array, bool given
array_diff_uassoc(): Argument #2 must be of type array, true given
--lowercase false--
array_diff_uassoc(): Argument #2 must be of type array, bool given
array_diff_uassoc(): Argument #2 must be of type array, false given
--uppercase TRUE--
array_diff_uassoc(): Argument #2 must be of type array, bool given
array_diff_uassoc(): Argument #2 must be of type array, true given
--uppercase FALSE--
array_diff_uassoc(): Argument #2 must be of type array, bool given
array_diff_uassoc(): Argument #2 must be of type array, false given
--empty string DQ--
array_diff_uassoc(): Argument #2 must be of type array, string given

16
ext/standard/tests/array/array_diff_ukey_variation1.phpt
View file

@ -155,20 +155,20 @@ array_diff_ukey(): Argument #1 ($array) must be of type array, null given
array_diff_ukey(): Argument #1 ($array) must be of type array, null given
--lowercase true--
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, true given
array_diff_ukey(): Argument #1 ($array) must be of type array, true given
--lowercase false--
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, false given
array_diff_ukey(): Argument #1 ($array) must be of type array, false given
--uppercase TRUE--
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, true given
array_diff_ukey(): Argument #1 ($array) must be of type array, true given
--uppercase FALSE--
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, bool given
array_diff_ukey(): Argument #1 ($array) must be of type array, false given
array_diff_ukey(): Argument #1 ($array) must be of type array, false given
--empty string DQ--
array_diff_ukey(): Argument #1 ($array) must be of type array, string given

16
ext/standard/tests/array/array_diff_ukey_variation2.phpt
View file

@ -159,20 +159,20 @@ array_diff_ukey(): Argument #2 must be of type array, null given
array_diff_ukey(): Argument #2 must be of type array, null given
--lowercase true--
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, true given
array_diff_ukey(): Argument #2 must be of type array, true given
--lowercase false--
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, false given
array_diff_ukey(): Argument #2 must be of type array, false given
--uppercase TRUE--
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, true given
array_diff_ukey(): Argument #2 must be of type array, true given
--uppercase FALSE--
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, bool given
array_diff_ukey(): Argument #2 must be of type array, false given
array_diff_ukey(): Argument #2 must be of type array, false given
--empty string DQ--
array_diff_ukey(): Argument #2 must be of type array, string given

8
ext/standard/tests/array/array_diff_variation1.phpt
View file

@ -122,13 +122,13 @@ echo "Done";
-- Iteration 11 --array_diff(): Argument #1 ($array) must be of type array, null given
-- Iteration 12 --array_diff(): Argument #1 ($array) must be of type array, bool given
-- Iteration 12 --array_diff(): Argument #1 ($array) must be of type array, true given
-- Iteration 13 --array_diff(): Argument #1 ($array) must be of type array, bool given
-- Iteration 13 --array_diff(): Argument #1 ($array) must be of type array, false given
-- Iteration 14 --array_diff(): Argument #1 ($array) must be of type array, bool given
-- Iteration 14 --array_diff(): Argument #1 ($array) must be of type array, true given
-- Iteration 15 --array_diff(): Argument #1 ($array) must be of type array, bool given
-- Iteration 15 --array_diff(): Argument #1 ($array) must be of type array, false given
-- Iteration 16 --array_diff(): Argument #1 ($array) must be of type array, string given

8
ext/standard/tests/array/array_diff_variation2.phpt
View file

@ -121,13 +121,13 @@ echo "Done";
-- Iteration 11 --array_diff(): Argument #2 must be of type array, null given
-- Iteration 12 --array_diff(): Argument #2 must be of type array, bool given
-- Iteration 12 --array_diff(): Argument #2 must be of type array, true given
-- Iteration 13 --array_diff(): Argument #2 must be of type array, bool given
-- Iteration 13 --array_diff(): Argument #2 must be of type array, false given
-- Iteration 14 --array_diff(): Argument #2 must be of type array, bool given
-- Iteration 14 --array_diff(): Argument #2 must be of type array, true given
-- Iteration 15 --array_diff(): Argument #2 must be of type array, bool given
-- Iteration 15 --array_diff(): Argument #2 must be of type array, false given
-- Iteration 16 --array_diff(): Argument #2 must be of type array, string given

16
ext/standard/tests/array/array_intersect_assoc_variation1.phpt
View file

@ -146,17 +146,17 @@ array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
-- Iteration 11 --array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
array_intersect_assoc(): Argument #1 ($array) must be of type array, null given
-- Iteration 12 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
-- Iteration 12 --array_intersect_assoc(): Argument #1 ($array) must be of type array, true given
array_intersect_assoc(): Argument #1 ($array) must be of type array, true given
-- Iteration 13 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
-- Iteration 13 --array_intersect_assoc(): Argument #1 ($array) must be of type array, false given
array_intersect_assoc(): Argument #1 ($array) must be of type array, false given
-- Iteration 14 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
-- Iteration 14 --array_intersect_assoc(): Argument #1 ($array) must be of type array, true given
array_intersect_assoc(): Argument #1 ($array) must be of type array, true given
-- Iteration 15 --array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
array_intersect_assoc(): Argument #1 ($array) must be of type array, bool given
-- Iteration 15 --array_intersect_assoc(): Argument #1 ($array) must be of type array, false given
array_intersect_assoc(): Argument #1 ($array) must be of type array, false given
-- Iteration 16 --array_intersect_assoc(): Argument #1 ($array) must be of type array, string given
array_intersect_assoc(): Argument #1 ($array) must be of type array, string given

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