Require Closures in const-expr to be static

Author: TimWolla

Zend/tests/closure_const_expr/attributes.phpt

@@ -12,10 +12,8 @@ class Attr {
     }
 }
 
-#[Attr(function () {
-
-})]
-#[Attr(function (...$args) {
+#[Attr(static function () { })]
+#[Attr(static function (...$args) {
   var_dump($args);
 })]
 class C {}

Zend/tests/closure_const_expr/basic.phpt

@@ -3,7 +3,7 @@ Allow defining Closures in const expressions.
 --FILE--
 <?php
 
-const Closure = function () {
+const Closure = static function () {
     echo "called", PHP_EOL;
 };
 

Zend/tests/closure_const_expr/class_const.phpt

@@ -4,7 +4,7 @@ Allow defining Closures in class constants.
 <?php
 
 class C {
-    const Closure = function () {
+    const Closure = static function () {
         echo "called", PHP_EOL;
     };
 }

Zend/tests/closure_const_expr/default_args.phpt

@@ -4,7 +4,7 @@ Closures in default argument
 <?php
 
 function test(
-    Closure $name = function () {
+    Closure $name = static function () {
         echo "default", PHP_EOL;
     },
 ) {

Zend/tests/closure_const_expr/disallows_using_variables.phpt

@@ -5,7 +5,7 @@ Disallows using variables.
 
 $foo = "bar";
 
-const Closure = function () use ($foo) {
+const Closure = static function () use ($foo) {
     echo $foo, PHP_EOL;
 };
 
@@ -14,4 +14,4 @@ var_dump(Closure);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use(...) variables in constant expression in %s on line %d
+Fatal error: Cannot "use(...)" variables in constant expression in %s on line %d

Zend/tests/closure_const_expr/property_initializer.phpt

@@ -4,7 +4,7 @@ Closure in property initializer
 <?php
 
 class C {
-    public Closure $d = function () {
+    public Closure $d = static function () {
         echo "called", PHP_EOL;
     };
 }

Zend/tests/closure_const_expr/static_initalizer.phpt

@@ -4,7 +4,7 @@ Closure in static initializer
 <?php
 
 function foo() {
-    static $closure = function () {
+    static $closure = static function () {
         echo "called", PHP_EOL;
     };
 

Zend/tests/closure_const_expr/static_property_initializer.phpt

@@ -4,7 +4,7 @@ Closure in static property initializer
 <?php
 
 class C {
-    public static Closure $d = function () {
+    public static Closure $d = static function () {
         echo "called", PHP_EOL;
     };
 }

Zend/zend_compile.c

@@ -11169,9 +11169,13 @@ static void zend_compile_const_expr_closure(zend_ast **ast_ptr)
 {
 	zend_ast_decl *closure_ast = (zend_ast_decl *) *ast_ptr;
 	zend_ast *uses_ast = closure_ast->child[1];
+	if (!(closure_ast->flags & ZEND_ACC_STATIC)) {
+		zend_error_noreturn(E_COMPILE_ERROR,
+			"Closures in constant expressions must be \"static\"");
+	}
 	if (uses_ast) {
 		zend_error_noreturn(E_COMPILE_ERROR,
-			"Cannot use(...) variables in constant expression");
+			"Cannot \"use(...)\" variables in constant expression");
 	}
 
 	znode node;