diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-17 10:47:30 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-18 11:18:19 +0100 |
| commit | 5d160e309ed207e618d49029e51c9c2dc2c5e61c (patch) | |
| tree | a6f1deb6f582e42792a8dccedb117a26decd3e65 /ext/reflection/php_reflection.c | |
| parent | e03284739f4a3a1052dfe5497fbf06c1b206f895 (diff) | |
| download | php-git-5d160e309ed207e618d49029e51c9c2dc2c5e61c.tar.gz | |
Fix static variable behavior with inheritance
When a method is inherited, the static variables will now always
use the initial values, rather than the values at the time of
inheritance. As such, behavior no longer depends on whether
inheritance happens before or after a method has been called.
This is implemented by always keeping static_variables as the
original values, and static_variables_ptr as the modified copy.
Closes GH-6705.
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 2f1a358518..bd487972ec 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1796,7 +1796,6 @@ ZEND_METHOD(ReflectionFunctionAbstract, getStaticVariables) array_init(return_value); ht = ZEND_MAP_PTR_GET(fptr->op_array.static_variables_ptr); if (!ht) { - ZEND_ASSERT(fptr->op_array.fn_flags & ZEND_ACC_IMMUTABLE); ht = zend_array_dup(fptr->op_array.static_variables); ZEND_MAP_PTR_SET(fptr->op_array.static_variables_ptr, ht); } |