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

Merge branch 'PHP-8.2'

Browse source
This commit is contained in:
Bob Weinand 2022-11-02 15:33:17 +01:00
commit 98646e3e21
3 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_inheritance.c
View file

@ -3136,13 +3136,11 @@ static zend_always_inline bool register_early_bound_ce(zval *delayed_early_bindi
if (EXPECTED(!(ce->ce_flags & ZEND_ACC_PRELOADED))) { if (EXPECTED(!(ce->ce_flags & ZEND_ACC_PRELOADED))) {
if (zend_hash_set_bucket_key(EG(class_table), (Bucket *)delayed_early_binding, lcname) != NULL) { if (zend_hash_set_bucket_key(EG(class_table), (Bucket *)delayed_early_binding, lcname) != NULL) {
Z_CE_P(delayed_early_binding) = ce; Z_CE_P(delayed_early_binding) = ce;
zend_observer_class_linked_notify(ce, lcname);
return true; return true;
} }
} else { } else {
/* If preloading is used, don't replace the existing bucket, add a new one. */ /* If preloading is used, don't replace the existing bucket, add a new one. */
if (zend_hash_add_ptr(EG(class_table), lcname, ce) != NULL) { if (zend_hash_add_ptr(EG(class_table), lcname, ce) != NULL) {
zend_observer_class_linked_notify(ce, lcname);
return true; return true;
} }
} }
@ -3150,7 +3148,6 @@ static zend_always_inline bool register_early_bound_ce(zval *delayed_early_bindi
return false; return false;
} }
if (zend_hash_add_ptr(CG(class_table), lcname, ce) != NULL) { if (zend_hash_add_ptr(CG(class_table), lcname, ce) != NULL) {
zend_observer_class_linked_notify(ce, lcname);
return true; return true;
} }
return false; return false;
@ -3171,6 +3168,7 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
if (UNEXPECTED(!register_early_bound_ce(delayed_early_binding, lcname, ret))) { if (UNEXPECTED(!register_early_bound_ce(delayed_early_binding, lcname, ret))) {
return NULL; return NULL;
} }
zend_observer_class_linked_notify(ret, lcname);
return ret; return ret;
} }
} else { } else {
@ -3245,6 +3243,7 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
if (ZSTR_HAS_CE_CACHE(ce->name)) { if (ZSTR_HAS_CE_CACHE(ce->name)) {
ZSTR_SET_CE_CACHE(ce->name, ce); ZSTR_SET_CE_CACHE(ce->name, ce);
} }
zend_observer_class_linked_notify(ce, lcname);
return ce; return ce;
} }

6
ext/opcache/zend_persist.c
View file

@ -723,7 +723,11 @@ static void zend_persist_class_method(zval *zv, zend_class_entry *ce)
} }
} }
} }
ZEND_MAP_PTR_NEW(op_array->run_time_cache); // Real dynamically created internal functions like enum methods must have their own run_time_cache pointer. They're always on the same scope as their defining class.
// However, copies - as caused by inheritance of internal methods - must retain the original run_time_cache pointer, shared with the source function.
if (!op_array->scope || op_array->scope == ce) {
ZEND_MAP_PTR_NEW(op_array->run_time_cache);
}
} }
} }
return; return;

33
ext/zend_test/tests/gh9871.phpt Normal file
View file

@ -0,0 +1,33 @@
--TEST--
Test observing inherited internal functions
--EXTENSIONS--
zend_test
--INI--
opcache.enable_cli=1
zend_test.observer.enabled=1
zend_test.observer.observe_all=1
zend_test.observer.show_return_value=1
--FILE--
<?php
class MyReflectionProperty extends ReflectionProperty {
}
class A {
protected $protected = 'a';
}
$property = new MyReflectionProperty('A', 'protected');
$property->setAccessible(true);
?>
--EXPECT--
<!-- init '/Users/bob.weinand/php-src/ext/zend_test/tests/gh9871.php' -->
<file '/Users/bob.weinand/php-src/ext/zend_test/tests/gh9871.php'>
<!-- init ReflectionProperty::__construct() -->
<ReflectionProperty::__construct>
</ReflectionProperty::__construct:NULL>
<!-- init ReflectionProperty::setAccessible() -->
<ReflectionProperty::setAccessible>
</ReflectionProperty::setAccessible:NULL>
</file '/Users/bob.weinand/php-src/ext/zend_test/tests/gh9871.php'>