[php-src] master: Merge branch 'PHP-8.6'
| From: | Arnaud Le Blanc | Date: | Wed, 14 Oct 2026 16:32:55 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.6' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142272@lists.php.net to get a copy of this message | ||
Author: Arnaud Le Blanc (arnaud-lb)
Date: 2026-10-14T18:31:53+02:00
Commit: https://github.com/php/php-src/commit/036c7cc46f13e0933c15786156ec371e23c8e8c0
Raw diff: https://github.com/php/php-src/commit/036c7cc46f13e0933c15786156ec371e23c8e8c0.diff
Merge branch 'PHP-8.6'
* PHP-8.6:
Fix array_map() optimization not resolving the class name of a static FCC (#24244)
Changed paths:
A Zend/tests/array_map_foreach_optimization_class_name.phpt
M Zend/zend_compile.c
Diff:
diff --git a/Zend/tests/array_map_foreach_optimization_class_name.phpt
b/Zend/tests/array_map_foreach_optimization_class_name.phpt
new file mode 100644
index 000000000000..fab9c51ee552
--- /dev/null
+++ b/Zend/tests/array_map_foreach_optimization_class_name.phpt
@@ -0,0 +1,74 @@
+--TEST--
+array_map(): foreach optimization resolves the class name of a static FCC
+--FILE--
+<?php
+
+namespace Foo {
+ class Bar {
+ public static function double(int $x): int {
+ return $x * 2;
+ }
+ }
+
+ class Parent_ {
+ public static function triple(int $x): int {
+ return $x * 3;
+ }
+ }
+
+ class Child extends Parent_ {
+ public static function scoped(): void {
+ var_dump(\array_map(self::triple(...), [1]));
+ var_dump(\array_map(static::triple(...), [1]));
+ var_dump(\array_map(parent::triple(...), [1]));
+ }
+ }
+
+ var_dump(\array_map(Bar::double(...), [1]));
+ Child::scoped();
+}
+
+namespace {
+ use Foo\Bar;
+ use Foo\Bar as Baz;
+
+ var_dump(array_map(Bar::double(...), [1]));
+ var_dump(array_map(Baz::double(...), [1]));
+ var_dump(array_map(\Foo\Bar::double(...), [1]));
+ var_dump(array_map(namespace\Foo\Bar::double(...), [1]));
+}
+
+?>
+--EXPECT--
+array(1) {
+ [0]=>
+ int(2)
+}
+array(1) {
+ [0]=>
+ int(3)
+}
+array(1) {
+ [0]=>
+ int(3)
+}
+array(1) {
+ [0]=>
+ int(3)
+}
+array(1) {
+ [0]=>
+ int(2)
+}
+array(1) {
+ [0]=>
+ int(2)
+}
+array(1) {
+ [0]=>
+ int(2)
+}
+array(1) {
+ [0]=>
+ int(2)
+}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index dfd7497a6ed0..504cc96c21d9 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5375,7 +5375,15 @@ static zend_result zend_compile_func_array_map(znode *result, zend_ast_list
*arg
/* Evaluate class name */
znode class_node;
- if (callback->kind == ZEND_AST_STATIC_CALL) {
+ if (callback->kind == ZEND_AST_STATIC_CALL
+ && callback->child[0]->kind == ZEND_AST_ZVAL
+ && Z_TYPE_P(zend_ast_get_zval(callback->child[0])) == IS_STRING
+ && zend_get_class_fetch_type(zend_ast_get_str(callback->child[0])) ==
ZEND_FETCH_CLASS_DEFAULT) {
+ /* Resolve the name against the namespace and imports, as compiling it
+ * as an expression would yield the unresolved string. */
+ class_node.op_type = IS_CONST;
+ ZVAL_STR(&class_node.u.constant, zend_resolve_class_name_ast(callback->child[0]));
+ } else if (callback->kind == ZEND_AST_STATIC_CALL) {
znode result;
zend_compile_expr(&result, callback->child[0]);
if (result.op_type == IS_CONST || result.op_type == IS_TMP_VAR) {