fixup! Support first-class callables in const-expressions

Author: TimWolla

Zend/tests/closure_const_expr/fcc/namespace_001.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Allow defining FCC in const expressions in a namespace.
+--FILE--
+<?php
+
+namespace Foo;
+
+const Closure = \strrev(...);
+
+var_dump(Closure);
+var_dump((Closure)("abc"));
+
+?>
+--EXPECTF--
+object(Closure)#%d (2) {
+  ["function"]=>
+  string(%d) "%s"
+  ["parameter"]=>
+  array(1) {
+    ["$string"]=>
+    string(10) "<required>"
+  }
+}
+string(3) "cba"

Zend/tests/closure_const_expr/fcc/namespace_002.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Allow defining FCC in const expressions in a namespace with global function fallback.
+--FILE--
+<?php
+
+namespace Foo;
+
+const Closure = strrev(...);
+
+var_dump(Closure);
+var_dump((Closure)("abc"));
+
+?>
+--EXPECTF--
+object(Closure)#%d (2) {
+  ["function"]=>
+  string(%d) "%s"
+  ["parameter"]=>
+  array(1) {
+    ["$string"]=>
+    string(10) "<required>"
+  }
+}
+string(3) "cba"

Zend/tests/closure_const_expr/fcc/namespace_003.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Allow defining FCC in const expressions in a namespace with function matching a global function.
+--FILE--
+<?php
+
+namespace Foo;
+
+function strrev(string $value) {
+    return 'not the global one';
+}
+
+const Closure = strrev(...);
+
+var_dump(Closure);
+var_dump((Closure)("abc"));
+
+?>
+--EXPECTF--
+object(Closure)#%d (2) {
+  ["function"]=>
+  string(%d) "%s"
+  ["parameter"]=>
+  array(1) {
+    ["$value"]=>
+    string(10) "<required>"
+  }
+}
+string(18) "not the global one"

Zend/zend_compile.c

@@ -11254,9 +11254,14 @@ static void zend_compile_const_expr_fcc(zend_ast **ast_ptr)
 	switch ((*ast_ptr)->kind) {
 		case ZEND_AST_CALL: {
 			zend_ast *name_ast = (*ast_ptr)->child[0];
-			if (name_ast->kind != ZEND_AST_ZVAL || Z_TYPE_P(zend_ast_get_zval(name_ast)) != IS_STRING) {
+			zval *name_ast_zv;
+			if (name_ast->kind != ZEND_AST_ZVAL || Z_TYPE_P(name_ast_zv = zend_ast_get_zval(name_ast)) != IS_STRING) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot use dynamic function name in constant expression");
 			}
+			bool is_fully_qualified;
+			zend_string *name = zend_resolve_function_name(Z_STR_P(name_ast_zv), name_ast->attr, &is_fully_qualified);
+			zval_ptr_dtor_nogc(name_ast_zv);
+			ZVAL_STR(name_ast_zv, name);
 			break;
 		}
 		case ZEND_AST_STATIC_CALL: {