[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5
| From: | ndossche | Date: | Tue, 29 Sep 2026 19:40:27 +0000 |
| Subject: | [php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141726@lists.php.net to get a copy of this message | ||
Author: ndossche (ndossche)
Date: 2026-09-29T21:39:34+02:00
Commit: https://github.com/php/php-src/commit/c72a5cad08bd54d516597ef57bf96cd47922d7e8
Raw diff: https://github.com/php/php-src/commit/c72a5cad08bd54d516597ef57bf96cd47922d7e8.diff
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-23842: skipLazyInitialization() copies unresolved constant defaults
Changed paths:
A Zend/tests/lazy_objects/gh23842.phpt
M NEWS
M ext/reflection/php_reflection.c
Diff:
diff --git a/NEWS b/NEWS
index 4ffe541ab5d4..1f0cfb46efef 100644
--- a/NEWS
+++ b/NEWS
@@ -134,6 +134,10 @@ PHP NEWS
. Fixed a heap over-read in the interactive shell prompt when cli.prompt is
set to an empty string. (Ilia Alshanetsky)
+- Reflection:
+ . Fixed bug GH-23842 (ReflectionProperty::skipLazyInitialization() copies
+ invalid constant defaults with OPcache). (DirkTrunkstar, Lazizbek Ergashev)
+
- Session:
. Fixed session_start() continuing after a failed create_sid() when
session.use_strict_mode rejects the supplied ID. (Ilia Alshanetsky)
diff --git a/Zend/tests/lazy_objects/gh23842.phpt b/Zend/tests/lazy_objects/gh23842.phpt
new file mode 100644
index 000000000000..fe791dde685b
--- /dev/null
+++ b/Zend/tests/lazy_objects/gh23842.phpt
@@ -0,0 +1,32 @@
+--TEST--
+GH-23842: skipLazyInitialization() copies an unresolved constant default with opcache
+--CREDITS--
+DirkTrunkstar
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_cache_only=0
+--FILE--
+<?php
+
+class Currency {
+ public const string EUR = 'EUR';
+}
+
+class Product {
+ public string $currency = Currency::EUR;
+}
+
+$reflector = new ReflectionClass(Product::class);
+$product = $reflector->newLazyGhost(function () {
+ throw new \Exception('initializer');
+});
+$reflector->getProperty('currency')->skipLazyInitialization($product);
+
+var_dump($product->currency);
+
+?>
+--EXPECT--
+string(3) "EUR"
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 9aa6a908627f..ea78bf601d48 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -6400,7 +6400,7 @@ ZEND_METHOD(ReflectionProperty, skipLazyInitialization)
RETURN_THROWS();
}
- zval *src = &object->ce->default_properties_table[OBJ_PROP_TO_NUM(prop->offset)];
+ zval *src = &CE_DEFAULT_PROPERTIES_TABLE(object->ce)[OBJ_PROP_TO_NUM(prop->offset)];
zval *dst = OBJ_PROP(object, prop->offset);
if (!(Z_PROP_FLAG_P(dst) & IS_PROP_LAZY)) {