Review

Author: arnaud-lb

Zend/tests/partial_application/references_001.phpt

@@ -7,7 +7,7 @@ function foo($a, $b) {
     $b = 2;
 }
 
-$a = [];
+$a = ['unchanged because foo() doesn\'t take by reference'];
 $b = &$a[0];
 
 $foo = foo(1, ?);
@@ -19,6 +19,6 @@ var_dump($a, $b);
 --EXPECT--
 array(1) {
   [0]=>
-  &NULL
+  &string(49) "unchanged because foo() doesn't take by reference"
 }
-NULL
+string(49) "unchanged because foo() doesn't take by reference"

Zend/tests/partial_application/reflection_005.phpt

@@ -3,14 +3,14 @@ Closure application reflection: ReflectionFunction::isClosure() is true for part
 --FILE--
 <?php
 
-echo (int)(new ReflectionFunction('sprintf'))->isClosure(), "\n";
+var_dump((new ReflectionFunction('sprintf'))->isClosure());
 
-echo (int)(new ReflectionFunction(function () {}))->isClosure(), "\n";
+var_dump((new ReflectionFunction(function () {}))->isClosure());
 
-echo (int)(new ReflectionFunction(sprintf(?)))->isClosure(), "\n";
+var_dump((new ReflectionFunction(sprintf(?)))->isClosure());
 
 ?>
---EXPECTF--
-0
-1
-1
+--EXPECT--
+bool(false)
+bool(true)
+bool(true)

Zend/tests/partial_application/superfluous_args_are_forwarded.phpt

@@ -1,27 +1,25 @@
 --TEST--
-PFAs forwarded superfluous args iff a '...' placeholder is specified
+PFAs forwards superfluous args iff a '...' placeholder is specified
 --FILE--
 <?php
 
 function f($a) {
     var_dump(func_get_args());
 }
+
 $f = f(?, ...);
 $f(1, 2, 3);
 
+$h = f(?);
+$h(1, 2, 3);
+
 function g($a,  ...$args) {
     var_dump(func_get_args());
 }
 
-$g = f(?, ...);
+$g = g(?, ...);
 $g(1, 2, 3);
 
-function h($a) {
-}
-
-$h = f(?);
-$h(1, 2, 3);
-
 ?>
 --EXPECT--
 array(3) {
@@ -32,6 +30,10 @@ array(3) {
   [2]=>
   int(3)
 }
+array(1) {
+  [0]=>
+  int(1)
+}
 array(3) {
   [0]=>
   int(1)
@@ -40,7 +42,3 @@ array(3) {
   [2]=>
   int(3)
 }
-array(1) {
-  [0]=>
-  int(1)
-}

Zend/tests/partial_application/this_001.phpt

@@ -14,8 +14,7 @@ $bar = $foo->method(new stdClass, ...);
 
 $baz = $bar(new stdClass, ...);
 
-var_dump($baz());
+var_dump($foo === $baz());
 ?>
---EXPECTF--
-object(Foo)#%d (0) {
-}
+--EXPECT--
+bool(true)

Zend/tests/partial_application/variation_ex_001.phpt

@@ -7,8 +7,8 @@ function test($a){}
 try {
     test(1,...)(?);
 } catch (Error $ex) {
-    echo "OK";
+    echo $ex::class, ": ", $ex->getMessage(), "\n";
 }
 ?>
---EXPECT--
-OK
+--EXPECTF--
+ArgumentCountError: Partial application of {closure:%s:%d}() expects at most 0 arguments, 1 given

Zend/zend_object_handlers.c

@@ -1677,6 +1677,7 @@ ZEND_API bool zend_check_protected(const zend_class_entry *ce, const zend_class_
 /* }}} */
 
 static zend_always_inline zend_arg_info* zend_get_call_trampoline_arginfo(void) {
+	// TODO: Move to MINIT
 	if (UNEXPECTED(zend_call_trampoline_arginfo[0].name == NULL)) {
 		zend_call_trampoline_arginfo[0].name = ZSTR_KNOWN(ZEND_STR_ARGS);
 	}