Additional test cases

Author: nikic

Zend/tests/named_params/lsp_no_conflict.phpt

@@ -45,6 +45,41 @@ class D implements I, J, K {
 (new D)->method(j: 42);
 (new D)->method(k: 42);
 (new D)->method(d: 42);
+echo "\n";
+
+trait T {
+    abstract public function method($t);
+}
+class X {
+    public function method($x) {
+        echo __METHOD__ . ": $x\n";
+    }
+}
+class Y extends X {
+    use T;
+
+    public function method($y) {
+        echo __METHOD__ . ": $y\n";
+    }
+}
+
+(new Y)->method(t: 42);
+(new Y)->method(x: 42);
+(new Y)->method(y: 42);
+echo "\n";
+
+// TODO: This case currently leaks.
+/*trait T2 {
+    public function method($t) {
+        echo __METHOD__ . ": $t\n";
+    }
+}
+class Z extends X {
+    use T2;
+}
+
+(new Z)->method(x: 42);
+(new Z)->method(t: 42);*/
 
 ?>
 --EXPECT--
@@ -58,3 +93,7 @@ D::method: 42
 D::method: 42
 D::method: 42
 D::method: 42
+
+Y::method: 42
+Y::method: 42
+Y::method: 42

Zend/tests/named_params/lsp_no_conflict_variadic.phpt

@@ -0,0 +1,51 @@
+--TEST--
+Can use parameter names from proto methods (variadic behavior)
+--FILE--
+<?php
+
+class A {
+    public function method($a) {
+        echo __METHOD__ . ": $a\n";
+    }
+}
+class B extends A {
+    public function method(...$args) {
+        echo __METHOD__ . ": " . json_encode($args) . "\n";
+    }
+}
+class C extends B {
+    public function method($c = null, ...$args) {
+        echo __METHOD__ . ": " . json_encode($c) . ", " . json_encode($args) . "\n";
+    }
+}
+class D extends B {
+    // #2 $a does not conflict with #1 $a because it has been shadowed variadically
+    public function method($c = null, $a = null, ...$args) {
+        echo __METHOD__ . ": " . json_encode($c) . ", " . json_encode($a)
+           . ", " . json_encode($args) . "\n";
+    }
+}
+
+(new B)->method(a: 42);
+(new B)->method(b: 42);
+echo "\n";
+(new C)->method(a: 42);
+(new C)->method(b: 42);
+(new C)->method(c: 42);
+echo "\n";
+(new D)->method(a: 42);
+(new D)->method(b: 42);
+(new D)->method(c: 42);
+
+?>
+--EXPECT--
+B::method: {"a":42}
+B::method: {"b":42}
+
+C::method: null, {"a":42}
+C::method: null, {"b":42}
+C::method: 42, []
+
+D::method: null, 42, []
+D::method: null, null, {"b":42}
+D::method: 42, null, []

Zend/zend_execute.c

@@ -4302,7 +4302,7 @@ static zend_always_inline uint32_t zend_get_arg_offset_by_name(
 			*(uintptr_t *)(cache_slot + 1) = Z_LVAL_P(zv);
 			return Z_LVAL_P(zv);
 		}
-		return (uint32_t) - 1;
+		goto not_found;
 	}
 
 	uint32_t num_args = fbc->common.num_args;
@@ -4327,6 +4327,7 @@ static zend_always_inline uint32_t zend_get_arg_offset_by_name(
 		}
 	}
 
+not_found:
 	if (fbc->common.fn_flags & ZEND_ACC_VARIADIC) {
 		*cache_slot = fbc;
 		*(uintptr_t *)(cache_slot + 1) = fbc->common.num_args;