php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Forbid a-vis on unilateral virtual prop

Browse Source 
The get-only case is obvious, there is no set operation so specifying its
visibility is senseless. The set-only case is also questionable, since there is
no operation other than set, so changing the visibility of the entire property
is preferable.

Closes GH-15698
This commit is contained in:
Ilija Tovilo
2024-09-01 22:28:19 +02:00
parent b81f9722db
commit 2b8a1b4258
4 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -12,6 +12,8 @@ PHP NEWS
. Implemented lazy objects RFC. (Arnaud)
. Fixed bug GH-15686 (Building shared iconv with external iconv library).
(Peter Kokot, zeriyoshi)
. Fixed missing error when adding asymmetric visibility to unilateral virtual
property. (ilutov)
- DOM:
. Fixed bug GH-13988 (Storing DOMElement consume 4 times more memory in

14
Zend/tests/asymmetric_visibility/virtual_get_only.phpt Normal file
View File

@@ -0,0 +1,14 @@
--TEST--
Get-only virtual property must not specify asymmetric visibility
--FILE--
<?php
class Foo {
public private(set) int $bar {
get => 42;
}
}
?>
--EXPECTF--
Fatal error: Unilateral virtual property Foo::$bar must not specify asymmetric visibility in %s on line %d

14
Zend/tests/asymmetric_visibility/virtual_set_only.phpt Normal file
View File

@@ -0,0 +1,14 @@
--TEST--
Set-only virtual property must not specify asymmetric visibility
--FILE--
<?php
class Foo {
public private(set) int $bar {
set {}
}
}
?>
--EXPECTF--
Fatal error: Unilateral virtual property Foo::$bar must not specify asymmetric visibility in %s on line %d

18
Zend/zend_inheritance.c
View File

@@ -1706,6 +1706,12 @@ ZEND_API void zend_verify_hooked_property(zend_class_entry *ce, zend_property_in
zend_error_noreturn(E_COMPILE_ERROR,
"Abstract property %s::$%s must specify at least one abstract hook", ZSTR_VAL(ce->name), ZSTR_VAL(prop_name));
}
if ((prop_info->flags & ZEND_ACC_VIRTUAL)
&& (prop_info->flags & ZEND_ACC_PPP_SET_MASK)
&& (!prop_info->hooks[ZEND_PROPERTY_HOOK_GET] || !prop_info->hooks[ZEND_PROPERTY_HOOK_SET])) {
zend_error_noreturn(E_COMPILE_ERROR,
"Unilateral virtual property %s::$%s must not specify asymmetric visibility", ZSTR_VAL(ce->name), ZSTR_VAL(prop_name));
}
}
ZEND_API ZEND_COLD ZEND_NORETURN void zend_hooked_property_variance_error_ex(zend_string *value_param_name, zend_string *class_name, zend_string *prop_name)
@@ -1893,11 +1899,13 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
} ZEND_HASH_FOREACH_END();
}
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&ce->properties_info, key, property_info) {
if (property_info->ce == ce && property_info->hooks) {
zend_verify_hooked_property(ce, property_info, key);
}
} ZEND_HASH_FOREACH_END();
if (ce->num_hooked_props) {
ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(&ce->properties_info, key, property_info) {
if (property_info->ce == ce && property_info->hooks) {
zend_verify_hooked_property(ce, property_info, key);
}
} ZEND_HASH_FOREACH_END();
}
if (zend_hash_num_elements(&parent_ce->constants_table)) {
zend_class_constant *c;