Make Closure in const-expr scoping behavior consistent with other Closures

Author: TimWolla

Zend/tests/closure_const_expr/attributes_scope_001.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Closure in attribute may access private variables
+--EXTENSIONS--
+reflection
+--FILE--
+<?php
+
+#[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
+class Attr {
+    public function __construct(public Closure $value) {}
+}
+
+#[Attr(static function (C $c) {
+    echo $c->secret, PHP_EOL;
+})]
+class C {
+    public function __construct(
+        private string $secret,
+    ) {}
+}
+
+foreach ((new ReflectionClass(C::class))->getAttributes() as $reflectionAttribute) {
+    ($reflectionAttribute->newInstance()->value)(new C('secret'));
+}
+
+?>
+--EXPECT--
+secret

Zend/tests/closure_const_expr/attributes_scope_002.phpt

@@ -0,0 +1,35 @@
+--TEST--
+Closure in attribute may not access unrelated private variables
+--EXTENSIONS--
+reflection
+--FILE--
+<?php
+
+#[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
+class Attr {
+    public function __construct(public Closure $value) {}
+}
+
+#[Attr(static function (E $e) {
+    echo $e->secret, PHP_EOL;
+})]
+class C {
+}
+
+class E {
+    public function __construct(
+        private string $secret,
+    ) {}
+}
+
+foreach ((new ReflectionClass(C::class))->getAttributes() as $reflectionAttribute) {
+    ($reflectionAttribute->newInstance()->value)(new E('secret'));
+}
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Cannot access private property E::$secret in %s:%d
+Stack trace:
+#0 %s(%d): C::{closure:%s:%d}(Object(E))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/closure_const_expr/disallows_non_static.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Disallows using variables.
+--FILE--
+<?php
+
+$foo = "bar";
+
+const Closure = function () {
+    echo $foo, PHP_EOL;
+};
+
+var_dump(Closure);
+(Closure)();
+
+?>
+--EXPECTF--
+Fatal error: Closures in constant expressions must be "static" in %s on line %d

Zend/tests/closure_const_expr/property_initializer_scope_001.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Closure in property initializer may access private variables
+--FILE--
+<?php
+
+class C {
+    public Closure $d = static function (C $c) {
+        echo $c->secret, PHP_EOL;
+    };
+
+    public function __construct(
+        private string $secret,
+    ) {}
+}
+
+$c = new C('secret');
+($c->d)($c);
+
+
+?>
+--EXPECTF--
+secret

Zend/tests/closure_const_expr/property_initializer_scope_002.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Closure in property initializer may not access unrelated private variables
+--FILE--
+<?php
+
+class C {
+    public Closure $d = static function (E $e) {
+        echo $e->secret, PHP_EOL;
+    };
+
+    
+}
+
+class E {
+    public function __construct(
+        private string $secret,
+    ) {}
+}
+
+$c = new C();
+($c->d)(new E('secret'));
+
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Cannot access private property E::$secret in %s:%d
+Stack trace:
+#0 %s(%d): C::{closure:%s:%d}(Object(E))
+#1 {main}
+  thrown in %s on line %d

Zend/zend_ast.c

@@ -995,8 +995,9 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 		{
 			zend_ast *child = ast->child[0];
 			zval *z = zend_ast_get_zval(child);
+			zend_function *func = Z_PTR_P(z);
 
-			zend_create_closure(result, Z_PTR_P(z), NULL, NULL, NULL);
+			zend_create_closure(result, func, scope, scope, NULL);
 			return SUCCESS;	
 		}
 		case ZEND_AST_PROP: