fixup! Support first-class callables in const-expressions

Author: TimWolla

Zend/tests/closure_const_expr/fcc/error_namespace_no_fallback_001.phpt

@@ -0,0 +1,18 @@
+--TEST--
+FCC in initializer errors for missing function with FQN matching global function.
+--FILE--
+<?php
+
+namespace Foo;
+
+const Closure = \Foo\strrev(...);
+
+var_dump(Closure);
+var_dump((Closure)("abc"));
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Call to undefined function Foo\strrev() in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/closure_const_expr/fcc/error_namespace_no_fallback_002.phpt

@@ -0,0 +1,18 @@
+--TEST--
+FCC in initializer errors for missing function with FQN matching global function.
+--FILE--
+<?php
+
+namespace Foo;
+
+const Closure = namespace\strrev(...);
+
+var_dump(Closure);
+var_dump((Closure)("abc"));
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Call to undefined function Foo\strrev() in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/zend_ast.c

@@ -1014,6 +1014,12 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 					zend_string *function_name_lc = zend_string_tolower(function_name);
 					fptr = zend_fetch_function(function_name_lc);
 					zend_string_release(function_name_lc);
+					if (!fptr && ast->child[0]->attr != ZEND_NAME_FQ) {
+						const char *backslash = zend_memrchr(ZSTR_VAL(function_name_lc), '\\', ZSTR_LEN(function_name_lc));
+						if (backslash) {
+							fptr = zend_fetch_function_str(backslash + 1, ZSTR_LEN(function_name_lc) - (backslash - ZSTR_VAL(function_name_lc) + 1));
+						}
+					}
 					if (!fptr) {
 						zend_throw_error(NULL, "Call to undefined function %s()", ZSTR_VAL(function_name));
 						return FAILURE;

Zend/zend_compile.c

@@ -11259,6 +11259,9 @@ static void zend_compile_const_expr_fcc(zend_ast **ast_ptr)
 			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);
+			if (is_fully_qualified) {
+				name_ast->attr = ZEND_NAME_FQ;
+			}
 			break;
 		}
 		case ZEND_AST_STATIC_CALL: {