Squashed changes

Author: arnaud-lb

Zend/Optimizer/zend_call_graph.c

@@ -147,10 +147,6 @@ ZEND_API void zend_analyze_calls(zend_arena **arena, zend_script *script, uint32
 						call_info->named_args = true;
 						break;
 					}
-					if (opline->opcode == ZEND_SEND_PLACEHOLDER
-							&& opline->op1.num == ZEND_PLACEHOLDER_VARIADIC) {
-						break;
-					}
 
 					uint32_t num = opline->op2.num;
 					if (num > 0) {

Zend/tests/partial_application/compile_errors_006.phpt

@@ -1,5 +1,5 @@
 --TEST--
-PFA compile errors: can not use unpacking in PFA, including with variadic placeholdres
+PFA compile errors: can not use unpacking in PFA, including with variadic placeholders
 --FILE--
 <?php
 foo(...["foo" => "bar"], ...);

Zend/tests/partial_application/deprecated.phpt

@@ -0,0 +1,14 @@
+--TEST--
+PFAs may emit deprecation warnings
+--FILE--
+<?php
+
+#[Deprecated] function f($a) {
+}
+
+$f = f(?);
+$f(1);
+
+?>
+--EXPECTF--
+Deprecated: Function f() is deprecated in %s on line %d

Zend/tests/partial_application/errors_003.phpt

@@ -62,11 +62,8 @@ try {
     printf("%s: %s\n", $ex::class, $ex->getMessage());
 }
 
-try {
-    $usleep(1, 2);
-} catch (Error $ex) {
-    printf("%s: %s\n", $ex::class, $ex->getMessage());
-}
+$usleep(1, 2);
+
 ?>
 --EXPECTF--
 ArgumentCountError: Too few arguments to function {closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected

Zend/tests/partial_application/errors_006.phpt

@@ -3,6 +3,16 @@ PFA errors: Some internal function parameters have UNKNOWN default value
 --FILE--
 <?php
 
+$f = array_keys(?, 42);
+var_dump($f([41, 42, 43]));
+
+$f = array_keys(?, '42', true);
+var_dump($f([41, 42, 43]));
+
+$f = array_keys(?, '42', strict: ?);
+var_dump($f([41, 42, 43], false));
+var_dump($f([41, 42, 43], true));
+
 try {
     // fn (array $array) => array_keys($array, ???, true)
     $f = array_keys(?, strict: true);
@@ -19,5 +29,17 @@ try {
 
 ?>
 --EXPECT--
+array(1) {
+  [0]=>
+  int(1)
+}
+array(0) {
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+array(0) {
+}
 ArgumentCountError: array_keys(): Argument #2 ($filter_value) must be passed explicitly, because the default value is not known
 ArgumentCountError: array_keys(): Argument #2 ($filter_value) must be passed explicitly, because the default value is not known

Zend/tests/partial_application/function_name.phpt

@@ -5,15 +5,36 @@ Partial application function name
 
 function g($a) {}
 
+class C {
+    static function m() {
+        echo "# From a method:\n";
+        var_dump((new ReflectionFunction(g(?)))->getName());
+    }
+}
+
 function f() {
+    echo "# From a function:\n";
     var_dump((new ReflectionFunction(g(?)))->getName());
+
+    echo "# Declared on same line:\n";
+    [$a, $b] = [g(?), g(?)];
+    var_dump((new ReflectionFunction($a))->getName(), (new ReflectionFunction($b))->getName());
 }
 
 f();
+C::m();
 
+echo "# From global scope:\n";
 var_dump((new ReflectionFunction(g(?)))->getName());
 
 ?>
 --EXPECTF--
-string(%d) "{closure:pfa:f():6}"
-string(%d) "{closure:pfa:%sfunction_name.php:11}"
+# From a function:
+string(20) "{closure:pfa:f():14}"
+# Declared on same line:
+string(20) "{closure:pfa:f():17}"
+string(20) "{closure:pfa:f():17}"
+# From a method:
+string(22) "{closure:pfa:C::m():8}"
+# From global scope:
+string(%d) "{closure:pfa:%sfunction_name.php:25}"

Zend/tests/partial_application/fuzz_001.phpt

@@ -7,7 +7,7 @@ $closure = function($a, $b) {};
 echo (string) new ReflectionFunction($closure(1, ?));
 ?>
 --EXPECTF--
-Closure [ <user> static function {closure:%s:%d} ] {
+Closure [ <user> function {closure:%s:%d} ] {
   @@ %s 4 - 4
 
   - Bound Variables [2] {

Zend/tests/partial_application/instance_polymorphism.phpt

@@ -0,0 +1,43 @@
+--TEST--
+PFA: instance polymorphism
+--FILE--
+<?php
+
+class P {
+    public function m(string $a): void {
+        echo __METHOD__, PHP_EOL;
+        var_dump($a);
+    }
+
+
+    public function get() {
+        /* The method is resolved before creating the PFA, and captured by the
+         * PFA. We use the signature of the resolved method. */
+        return $this->m(?);
+    }
+}
+
+class C extends P {
+    public function m(string|array $b): void {
+        echo __METHOD__, PHP_EOL;
+        var_dump($b);
+    }
+}
+
+for ($i = 0; $i < 2; $i++) {
+    (new P())->get()(a: 'a');
+    (new C())->get()(b: []);
+}
+
+?>
+--EXPECT--
+P::m
+string(1) "a"
+C::m
+array(0) {
+}
+P::m
+string(1) "a"
+C::m
+array(0) {
+}

Zend/tests/partial_application/magic_001.phpt

@@ -3,10 +3,10 @@ __call() can be partially applied
 --FILE--
 <?php
 class Foo {
-    public function __call($method, $args) {
+    public function __call($method, $arguments) {
         printf("%s::%s\n", __CLASS__, $method);
 
-        var_dump(...$args);
+        var_dump(...$arguments);
     }
 }
 
@@ -22,19 +22,15 @@ try {
     printf("%s: %s\n", $ex::class, $ex->getMessage());
 }
 
-try {
-    $bar(1, 2);
-} catch (Error $ex) {
-    printf("%s: %s\n", $ex::class, $ex->getMessage());
-}
-
+$bar(1, 2);
 $bar(1);
 
 $bar = $foo->method(?, ...);
 
 echo (string) new ReflectionFunction($bar);
 
 $bar(10);
+$bar(10, 20);
 
 $bar = $foo->method(new Foo, ...);
 
@@ -47,7 +43,7 @@ Closure [ <user> public method {closure:%s:%d} ] {
   @@ %s 12 - 12
 
   - Parameters [1] {
-    Parameter #0 [ <required> $args0 ]
+    Parameter #0 [ <required> mixed $arguments0 ]
   }
 }
 ArgumentCountError: Too few arguments to function Foo::{closure:%s:%d}(), 0 passed in %s on line %d and exactly 1 expected
@@ -56,24 +52,27 @@ int(1)
 Foo::method
 int(1)
 Closure [ <user> public method {closure:%s:%d} ] {
-  @@ %s 30 - 30
+  @@ %s 25 - 25
 
   - Parameters [2] {
-    Parameter #0 [ <required> $args0 ]
-    Parameter #1 [ <optional> ...$args ]
+    Parameter #0 [ <required> mixed $arguments0 ]
+    Parameter #1 [ <optional> mixed ...$arguments ]
   }
 }
 Foo::method
 int(10)
+Foo::method
+int(10)
+int(20)
 Closure [ <user> public method {closure:%s:%d} ] {
-  @@ %s 36 - 36
+  @@ %s 32 - 32
 
   - Bound Variables [1] {
-      Variable #0 [ $args0 ]
+      Variable #0 [ $arguments0 ]
   }
 
   - Parameters [1] {
-    Parameter #0 [ <optional> ...$args ]
+    Parameter #0 [ <optional> mixed ...$arguments ]
   }
 }
 Foo::method

Zend/tests/partial_application/magic_002.phpt

@@ -3,10 +3,10 @@ __callStatic() can be partially applied
 --FILE--
 <?php
 class Foo {
-    public static function __callStatic($method, $args) {
+    public static function __callStatic($method, $arguments) {
         printf("%s::%s\n", __CLASS__, $method);
 
-        var_dump(...$args);
+        var_dump(...$arguments);
     }
 }
 
@@ -15,12 +15,14 @@ $bar = Foo::method(?);
 echo (string) new ReflectionFunction($bar);
 
 $bar(1);
+$bar(1, 2);
 
 $bar = Foo::method(?, ...);
 
 echo (string) new ReflectionFunction($bar);
 
 $bar(10);
+$bar(10, 20);
 
 $bar = Foo::method(new Foo,...);
 
@@ -33,30 +35,35 @@ Closure [ <user> static public method {closure:%s:%d} ] {
   @@ %s 10 - 10
 
   - Parameters [1] {
-    Parameter #0 [ <required> $args0 ]
+    Parameter #0 [ <required> mixed $arguments0 ]
   }
 }
 Foo::method
 int(1)
+Foo::method
+int(1)
 Closure [ <user> static public method {closure:%s:%d} ] {
-  @@ %s 16 - 16
+  @@ %s 17 - 17
 
   - Parameters [2] {
-    Parameter #0 [ <required> $args0 ]
-    Parameter #1 [ <optional> ...$args ]
+    Parameter #0 [ <required> mixed $arguments0 ]
+    Parameter #1 [ <optional> mixed ...$arguments ]
   }
 }
 Foo::method
 int(10)
+Foo::method
+int(10)
+int(20)
 Closure [ <user> static public method {closure:%s:%d} ] {
-  @@ %s 22 - 22
+  @@ %s 24 - 24
 
   - Bound Variables [1] {
-      Variable #0 [ $args0 ]
+      Variable #0 [ $arguments0 ]
   }
 
   - Parameters [1] {
-    Parameter #0 [ <optional> ...$args ]
+    Parameter #0 [ <optional> mixed ...$arguments ]
   }
 }
 Foo::method