Skip to content

Commit fa9be4a

Browse files
Match RFC message
1 parent 3f5a133 commit fa9be4a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Zend/tests/debug_info/debug_info.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ object(Foo)#%d (3) {
3737
int(3)
3838
}
3939

40-
Deprecated: Returning null from Bar::__debugInfo() is deprecated in %s on line %d
40+
Deprecated: Returning null from Bar::__debugInfo() is deprecated, return an empty array instead in %s on line %d
4141
object(Bar)#%d (0) {
4242
}

Zend/tests/debug_info/recursion_return_null.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var_dump($f);
2424
--EXPECTF--
2525
in handler
2626

27-
Deprecated: Returning null from Foo::__debugInfo() is deprecated in %s on line %d
27+
Deprecated: Returning null from Foo::__debugInfo() is deprecated, return an empty array instead in %s on line %d
2828
object(Foo)#3 (0) {
2929
}
3030
object(Foo)#2 (0) {

Zend/zend_object_handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /
223223
return Z_ARRVAL(retval);
224224
}
225225
} else if (Z_TYPE(retval) == IS_NULL) {
226-
zend_error(E_DEPRECATED, "Returning null from %s::__debugInfo() is deprecated",
226+
zend_error(E_DEPRECATED, "Returning null from %s::__debugInfo() is deprecated, return an empty array instead",
227227
ZSTR_VAL(ce->name));
228228
*is_temp = 1;
229229
ht = zend_new_array(0);

0 commit comments

Comments
 (0)