Improve and consolidate test cases

Author: nikic

Zend/tests/arrow_functions/001.phpt

@@ -12,8 +12,34 @@ var_dump($foo(2));
 $foo = fn($x, $y) => $x + $y;
 var_dump($foo(1, 2));
 
+// Closing over $var
+$var = 4;
+$foo = fn() => $var;
+var_dump($foo());
+
+// Not closing over $var, it's a parameter
+$foo = fn($var) => $var;
+var_dump($foo(5));
+
+// Close over $var by-value, not by-reference
+$var = 5;
+$foo = fn() => ++$var;
+var_dump($foo());
+var_dump($var);
+
+// Nested arrow functions closing over variable
+$var = 6;
+var_dump((fn() => fn() => $var)()());
+var_dump((fn() => function() use($var) { return $var; })()());
+
 ?>
 --EXPECT--
 int(1)
 int(2)
 int(3)
+int(4)
+int(5)
+int(6)
+int(5)
+int(6)
+int(6)

Zend/tests/arrow_functions/002.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Arrow functions implicit use must be throwing notices only upon actual use
+--FILE--
+<?php
+
+$b = 1;
+
+var_dump((fn() => $b + $c)());
+
+?>
+--EXPECTF--
+Notice: Undefined variable: c in %s on line %d
+int(1)

Zend/tests/arrow_functions/003.phpt

@@ -1,12 +1,21 @@
 --TEST--
-Arrow function closing over variable
+Variable-variables inside arrow functions
 --FILE--
 <?php
 
-$b = 1;
+$a = 1;
+$var = "a";
+$fn = fn() => $$var;
+var_dump($fn());
 
-var_dump((fn() => $b)());
+${5} = 2;
+$fn = fn() => ${5};
+var_dump($fn());
 
 ?>
---EXPECT--
-int(1)
+--EXPECTF--
+Notice: Undefined variable: a in %s on line %d
+NULL
+
+Notice: Undefined variable: 5 in %s on line %d
+NULL

Zend/tests/arrow_functions/004.phpt

@@ -1,13 +1,13 @@
 --TEST--
-Arrow functions implicit use must be throwing notices only upon actual use
+Auto-globals in arrow functions
 --FILE--
 <?php
 
-$b = 1;
-
-var_dump((fn() => $b + $c)());
+// This should work, but *not* generate a binding for $GLOBALS
+$a = 123;
+$fn = fn() => $GLOBALS['a'];
+var_dump($fn());
 
 ?>
---EXPECTF--
-Notice: Undefined variable: c in %s on line %d
-int(1)
+--EXPECT--
+int(123)

Zend/tests/arrow_functions/005.phpt

@@ -1,13 +1,49 @@
 --TEST--
-Arrow function closing over variable by value
+Arrow function $this binding
 --FILE--
 <?php
 
-$b = 2;
+class Test {
+    public function method() {
+        // It would be okay if this is NULL, but the rest should work
+        $fn = fn() => 42;
+        $r = new ReflectionFunction($fn);
+        var_dump($r->getClosureThis());
+
+        $fn = fn() => $this;
+        var_dump($fn());
+
+        $fn = fn() => Test::method2();
+        $fn();
+
+        $fn = fn() => call_user_func('Test::method2');
+        $fn();
+
+        $thisName = "this";
+        $fn = fn() => $$thisName;
+        var_dump($fn());
+
+        $fn = fn() => self::class;
+        var_dump($fn());
+    }
+
+    public function method2() {
+        var_dump($this);
+    }
+}
+
+(new Test)->method();
 
-var_dump((fn() => ++$b)());
-var_dump($b);
 ?>
 --EXPECT--
-int(3)
-int(2)
+object(Test)#1 (0) {
+}
+object(Test)#1 (0) {
+}
+object(Test)#1 (0) {
+}
+object(Test)#1 (0) {
+}
+object(Test)#1 (0) {
+}
+string(4) "Test"