Skip to content

Fix indirect readonly error messages #14979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Fix indirect readonly error messages #14979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2091ed8
Fix indirect readonly error messages
iluuu1994 Jul 16, 2024
e392002
Fix message with cache slot
iluuu1994 Jul 16, 2024
b824362
Fix tests again
iluuu1994 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/tests/enum/no-pass-properties-by-ref.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ var_dump(Foo::Bar->value);

?>
--EXPECT--
Cannot modify readonly property Foo::$value
Cannot indirectly modify readonly property Foo::$value
int(0)
2 changes: 1 addition & 1 deletion Zend/tests/enum/no-return-properties-by-ref.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ var_dump(Foo::Bar->value);

?>
--EXPECT--
Cannot modify readonly property Foo::$value
Cannot indirectly modify readonly property Foo::$value
int(0)
2 changes: 1 addition & 1 deletion Zend/tests/enum/no-write-properties-through-foreach-reference.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ var_dump(Foo::Bar->value);

?>
--EXPECT--
Cannot modify readonly property Foo::$value
Cannot indirectly modify readonly property Foo::$value
int(0)
2 changes: 1 addition & 1 deletion Zend/tests/enum/no-write-properties-through-references.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ var_dump(Foo::Bar->value);

?>
--EXPECT--
Cannot modify readonly property Foo::$value
Cannot indirectly modify readonly property Foo::$value
int(0)
16 changes: 8 additions & 8 deletions Zend/tests/readonly_props/cache_slot.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,35 +88,35 @@ $replaceProp3();
var_dump($test->prop3);

?>
--EXPECT--
--EXPECTF--
string(1) "a"
Cannot modify readonly property Test::$prop
string(1) "a"

Cannot modify readonly property Test::$prop2
Cannot indirectly modify readonly property Test::$prop2
Cannot modify readonly property Test::$prop2
array(0) {
}

object(stdClass)#3 (1) {
object(stdClass)#%d (1) {
["foo"]=>
int(1)
}
object(stdClass)#3 (1) {
object(stdClass)#%d (1) {
["foo"]=>
int(1)
}

Cannot modify readonly property Test::$prop2
Cannot modify readonly property Test::$prop2
Cannot indirectly modify readonly property Test::$prop2
Cannot indirectly modify readonly property Test::$prop2
array(0) {
}

object(stdClass)#5 (1) {
object(stdClass)#%d (1) {
["foo"]=>
int(1)
}
object(stdClass)#5 (1) {
object(stdClass)#%d (1) {
["foo"]=>
int(1)
}
10 changes: 5 additions & 5 deletions Zend/tests/readonly_props/readonly_clone_error5.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ try {
}

?>
--EXPECT--
object(TestSetOnce)#2 (1) {
--EXPECTF--
object(TestSetOnce)#%d (1) {
["prop"]=>
array(1) {
[0]=>
int(1)
}
}
object(TestSetOnce)#1 (1) {
object(TestSetOnce)#%d (1) {
["prop"]=>
array(1) {
[0]=>
int(1)
}
}
Cannot modify readonly property TestSetTwice::$prop
Cannot modify readonly property TestSetTwice::$prop
Cannot indirectly modify readonly property TestSetTwice::$prop
Cannot indirectly modify readonly property TestSetTwice::$prop
10 changes: 5 additions & 5 deletions Zend/tests/readonly_props/readonly_modification.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ Cannot modify readonly property Test::$prop
Cannot modify readonly property Test::$prop
Cannot modify readonly property Test::$prop
Cannot modify readonly property Test::$prop
Cannot modify readonly property Test::$prop
Cannot modify readonly property Test::$prop
Cannot modify readonly property Test::$prop
Cannot indirectly modify readonly property Test::$prop
Cannot indirectly modify readonly property Test::$prop
Cannot indirectly modify readonly property Test::$prop
array(0) {
}
Cannot modify readonly property Test::$prop2
Cannot modify readonly property Test::$prop2
Cannot indirectly modify readonly property Test::$prop2
Cannot indirectly modify readonly property Test::$prop2
4 changes: 2 additions & 2 deletions Zend/tests/readonly_props/variation.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ foreach ([true, false] as $init) {
Init: 1, scope: 1, op: r: 1
Init: 1, scope: 1, op: w: Cannot modify readonly property Test::$prop
Init: 1, scope: 1, op: rw: Cannot modify readonly property Test::$prop
Init: 1, scope: 1, op: im: Cannot modify readonly property Test::$prop
Init: 1, scope: 1, op: im: Cannot indirectly modify readonly property Test::$prop
Init: 1, scope: 1, op: is: 1
Init: 1, scope: 1, op: us: Cannot unset readonly property Test::$prop
Init: 1, scope: 0, op: r: 1
Init: 1, scope: 0, op: w: Cannot modify readonly property Test::$prop
Init: 1, scope: 0, op: rw: Cannot modify readonly property Test::$prop
Init: 1, scope: 0, op: im: Cannot modify readonly property Test::$prop
Init: 1, scope: 0, op: im: Cannot indirectly modify readonly property Test::$prop
Init: 1, scope: 0, op: is: 1
Init: 1, scope: 0, op: us: Cannot unset readonly property Test::$prop
Init: 0, scope: 1, op: r: Typed property Test::$prop must not be accessed before initialization
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3367,7 +3367,7 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c
} else if (Z_PROP_FLAG_P(ptr) & IS_PROP_REINITABLE) {
Z_PROP_FLAG_P(ptr) &= ~IS_PROP_REINITABLE;
} else {
zend_readonly_property_modification_error(prop_info);
zend_readonly_property_indirect_modification_error(prop_info);
ZVAL_ERROR(result);
}
return;
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_object_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
} else if (Z_PROP_FLAG_P(retval) & IS_PROP_REINITABLE) {
Z_PROP_FLAG_P(retval) &= ~IS_PROP_REINITABLE;
} else {
zend_readonly_property_modification_error(prop_info);
zend_readonly_property_indirect_modification_error(prop_info);
retval = &EG(uninitialized_zval);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13959,7 +13959,7 @@ static int zend_jit_fetch_obj(zend_jit_ctx *jit,
ir_IF_FALSE(if_reinitable);

jit_SET_EX_OPLINE(jit, opline);
ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_readonly_property_modification_error), prop_info_ref);
ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_readonly_property_indirect_modification_error), prop_info_ref);
jit_set_Z_TYPE_INFO(jit, res_addr, _IS_ERROR);
ir_END_list(end_inputs);

Expand Down Expand Up @@ -14033,7 +14033,7 @@ static int zend_jit_fetch_obj(zend_jit_ctx *jit,

ir_IF_FALSE(if_reinitable);
jit_SET_EX_OPLINE(jit, opline);
ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_readonly_property_modification_error), ir_CONST_ADDR(prop_info));
ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_readonly_property_indirect_modification_error), ir_CONST_ADDR(prop_info));
jit_set_Z_TYPE_INFO(jit, res_addr, _IS_ERROR);
ir_END_list(end_inputs);

Expand Down
Loading