Pass method args as an array to allow optional pass-by-reference

betterphp · betterphp · commit 8ae6f52f8726 · 2017-01-19T15:14:48.000Z
diff --git a/tests/test_classes/example_class.php b/tests/test_classes/example_class.php
@@ -54,4 +54,8 @@ public function test_set_reference_method(string &$target = null, string $value)
         $target = $value;
     }
 
+    public function test_value_method(string $value) {
+        return $value;
+    }
+
 }
diff --git a/tests/utils/ReflectionTest.php b/tests/utils/ReflectionTest.php
@@ -177,7 +177,7 @@ public function testSetStaticProperty() {
      * @dataProvider dataCallMethod
      */
     public function testCallMethod(string $object_property, string $method_name, int $input, int $expected) {
-        $this->assertSame($expected, reflection::call_method($this->{$object_property}, $method_name, $input));
+        $this->assertSame($expected, reflection::call_method($this->{$object_property}, $method_name, [$input]));
     }
 
     public function dataCallMethod(): array {
@@ -191,7 +191,7 @@ public function dataCallMethod(): array {
      * @dataProvider dataCallStaticMethod
      */
     public function testCallStaticMethod(string $class_name, string $method_name, int $input, int $expected) {
-        $this->assertSame($expected, reflection::call_method($class_name, $method_name, $input));
+        $this->assertSame($expected, reflection::call_method($class_name, $method_name, [$input]));
     }
 
     public function dataCallStaticMethod(): array {
@@ -205,19 +205,26 @@ public function testCallMethodWithReference() {
         $test_value = 10;
         $expected_value = ($test_value * 2);
 
-        reflection::call_method($this->example_object, 'test_reference_method', $test_value);
+        reflection::call_method($this->example_object, 'test_reference_method', [&$test_value]);
 
         $this->assertSame($expected_value, $test_value);
     }
 
     public function testCallMethodSetReferenceValue() {
         $expected_value = 'wow such test';
 
-        reflection::call_method($this->example_object, 'test_set_reference_method', $actual_value, $expected_value);
+        reflection::call_method($this->example_object, 'test_set_reference_method', [&$actual_value, &$expected_value]);
 
         $this->assertSame($expected_value, $actual_value);
     }
 
+    public function testCallMethodWithValue() {
+        // Not using a variable here as we need to test a value vs a reference
+        $result = reflection::call_method($this->example_object, 'test_value_method', ['some string']);
+
+        $this->assertSame('some string', $result);
+    }
+
     //
 
 }
diff --git a/utils/reflection.php b/utils/reflection.php
@@ -106,11 +106,11 @@ public static function set_property($object, string $property_name, $value) {
      *
      * @param mixed $object The object or class name that the function is from
      * @param string $method_name The name of the method to be called
-     * @param mixed ...$args The arguments to pass to the function
+     * @param array $args The arguments to pass to the function
      *
      * @return mixed The value returned by the function
      */
-    public static function call_method($object, string $method_name, &...$args) {
+    public static function call_method($object, string $method_name, array $args) {
         $class_name = (is_object($object)) ? get_class($object) : $object;
         $class_name = static::resolve_method_class($class_name, $method_name);
 

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,8 @@ public function test_set_reference_method(string &$target = null, string $value)`
`54`	`54`	`$target = $value;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ public function test_value_method(string $value) {`
	`58`	`+ return $value;`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,11 @@ public static function set_property($object, string $property_name, $value) {`
`106`	`106`	`*`
`107`	`107`	`* @param mixed $object The object or class name that the function is from`
`108`	`108`	`* @param string $method_name The name of the method to be called`
`109`		`- * @param mixed ...$args The arguments to pass to the function`
	`109`	`+ * @param array $args The arguments to pass to the function`
`110`	`110`	`*`
`111`	`111`	`* @return mixed The value returned by the function`
`112`	`112`	`*/`
`113`		`- public static function call_method($object, string $method_name, &...$args) {`
	`113`	`+ public static function call_method($object, string $method_name, array $args) {`
`114`	`114`	`$class_name = (is_object($object)) ? get_class($object) : $object;`
`115`	`115`	`$class_name = static::resolve_method_class($class_name, $method_name);`
`116`	`116`