fixup! Support first-class callables in const-expressions

Author: TimWolla

Zend/tests/closure_const_expr/fcc/error_dynamic_004.phpt

@@ -0,0 +1,20 @@
+--TEST--
+FCC in initializer errors for FCC on 'static::'.
+--FILE--
+<?php
+
+class Foo {
+    public const Closure = static::myMethod(...);
+
+    public static function myMethod(string $foo) {
+        echo "Called ", __METHOD__, PHP_EOL;
+        var_dump($foo);
+    }
+}
+
+var_dump(Foo::Closure);
+(Foo::Closure)("abc");
+
+?>
+--EXPECTF--
+Fatal error: "static" is not allowed in compile-time constants in %s on line %d

Zend/tests/closure_const_expr/fcc/static_call.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Allow defining FCC for userland functions in const expressions.
+Allow defining FCC for static methods in const expressions.
 --FILE--
 <?php
 

Zend/tests/closure_const_expr/fcc/static_call_self.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Allow defining FCC for static methods referenced by 'self::' in const expressions.
+--FILE--
+<?php
+
+class Foo {
+    public const Closure = self::myMethod(...);
+
+    public static function myMethod(string $foo) {
+        echo "Called ", __METHOD__, PHP_EOL;
+        var_dump($foo);
+    }
+}
+
+var_dump(Foo::Closure);
+(Foo::Closure)("abc");
+
+?>
+--EXPECTF--
+object(Closure)#%d (2) {
+  ["function"]=>
+  string(13) "Foo::myMethod"
+  ["parameter"]=>
+  array(1) {
+    ["$foo"]=>
+    string(10) "<required>"
+  }
+}
+Called Foo::myMethod
+string(3) "abc"

Zend/zend_ast.c

@@ -1009,8 +1009,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 				case ZEND_AST_STATIC_CALL: {
 					ZEND_ASSERT(ast->child[2]->kind == ZEND_AST_CALLABLE_CONVERT);
 
-					zend_string *class_name = zend_ast_get_str(ast->child[0]);
-					zend_class_entry *ce = zend_fetch_class_with_scope(class_name, (ast->attr >> ZEND_CONST_EXPR_NEW_FETCH_TYPE_SHIFT) | ZEND_FETCH_CLASS_EXCEPTION, scope);
+					zend_class_entry *ce = zend_ast_fetch_class(ast->child[0], scope);
 					if (!ce) {
 						return FAILURE;
 					}

Zend/zend_compile.c

@@ -11182,9 +11182,8 @@ static void zend_compile_const_expr_magic_const(zend_ast **ast_ptr) /* {{{ */
 }
 /* }}} */
 
-static void zend_compile_const_expr_new(zend_ast **ast_ptr)
+static void zend_compile_const_expr_class_reference(zend_ast *class_ast)
 {
-	zend_ast *class_ast = (*ast_ptr)->child[0];
 	if (class_ast->kind == ZEND_AST_CLASS) {
 		zend_error_noreturn(E_COMPILE_ERROR,
 			"Cannot use anonymous class in constant expression");
@@ -11207,6 +11206,12 @@ static void zend_compile_const_expr_new(zend_ast **ast_ptr)
 	class_ast->attr = fetch_type << ZEND_CONST_EXPR_NEW_FETCH_TYPE_SHIFT;
 }
 
+static void zend_compile_const_expr_new(zend_ast **ast_ptr)
+{
+	zend_ast *class_ast = (*ast_ptr)->child[0];
+	zend_compile_const_expr_class_reference(class_ast);
+}
+
 static void zend_compile_const_expr_closure(zend_ast **ast_ptr)
 {
 	zend_ast_decl *closure_ast = (zend_ast_decl *) *ast_ptr;
@@ -11256,9 +11261,7 @@ static void zend_compile_const_expr_fcc(zend_ast **ast_ptr)
 		}
 		case ZEND_AST_STATIC_CALL: {
 			zend_ast *class_ast = (*ast_ptr)->child[0];
-			if (class_ast->kind != ZEND_AST_ZVAL || Z_TYPE_P(zend_ast_get_zval(class_ast)) != IS_STRING) {
-				zend_error_noreturn(E_COMPILE_ERROR, "Cannot use dynamic class name in constant expression");
-			}
+			zend_compile_const_expr_class_reference(class_ast);
 			zend_ast *method_ast = (*ast_ptr)->child[1];
 			if (method_ast->kind != ZEND_AST_ZVAL || Z_TYPE_P(zend_ast_get_zval(method_ast)) != IS_STRING) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot use dynamic method name in constant expression");