Rename standard array function parameters to $array

This is targeting 8.0.

`$arg` seems like a poor choice of a name,
especially if the function were to have arguments added.

In many cases, the php.net documentation already has $array for these functions.
E.g. https://www.php.net/manual/en/function.array-intersect.php

I'd assume that since named arguments was added to 8.0 near the feature freeze,
PHP's maintainers had planned to make the names consistent
and gradually use the same name for  docs and implementation.

1 files changed, 58 insertions, 58 deletions

diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt
index f8389dd961..302ea149d8 100644
--- a/ext/standard/tests/array/array_intersect_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_variation2.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test array_intersect() function : usage variations - unexpected values for 'arr2' argument
+Test array_intersect() function : usage variations - unexpected values for 'array2' argument
 --FILE--
 <?php
 /*
-* Testing array_intersect() function by passing values to $arr2 argument other than arrays
+* Testing array_intersect() function by passing values to $array2 argument other than arrays
 * and see that function emits proper warning messages wherever expected.
-* The $arr1 argument is a fixed array.
+* The $array1 argument is a fixed array.
 */
 
-echo "*** Testing array_intersect() : Passing non-array values to \$arr2 argument ***\n";
+echo "*** Testing array_intersect() : Passing non-array values to \$array2 argument ***\n";
 
-// array to be passsed to $arr1 as default argument
-$arr1 = array(1, 2);
+// array to be passsed to $array1 as default argument
+$array1 = array(1, 2);
 
 // arrays to be passed to optional argument
 $arr3 = array(1, 2, "one" => 1, "two" => 2);
@@ -36,7 +36,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-// unexpected values to be passed to $arr2 argument
+// unexpected values to be passed to $array2 argument
 $arrays = array(
 
        // int data
@@ -91,14 +91,14 @@ foreach($arrays as $unexpected_value) {
 
     // Calling array_intersect() with default arguments
     try {
-        var_dump( array_intersect($arr1,$unexpected_value) );
+        var_dump( array_intersect($array1,$unexpected_value) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
 
     // Calling array_intersect() with more arguments
     try {
-        var_dump( array_intersect($arr1, $unexpected_value, $arr3) );
+        var_dump( array_intersect($array1, $unexpected_value, $arr3) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -112,77 +112,77 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECT--
-*** Testing array_intersect() : Passing non-array values to $arr2 argument ***
+*** Testing array_intersect() : Passing non-array values to $array2 argument ***
 
--- Iterator 1 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 1 --array_intersect(): Argument #2 ($array2) must be of type array, int given
+array_intersect(): Argument #2 ($array2) must be of type array, int given
 
--- Iterator 2 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 2 --array_intersect(): Argument #2 ($array2) must be of type array, int given
+array_intersect(): Argument #2 ($array2) must be of type array, int given
 
--- Iterator 3 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 3 --array_intersect(): Argument #2 ($array2) must be of type array, int given
+array_intersect(): Argument #2 ($array2) must be of type array, int given
 
--- Iterator 4 --array_intersect(): Argument #2 ($arr2) must be of type array, int given
-array_intersect(): Argument #2 ($arr2) must be of type array, int given
+-- Iterator 4 --array_intersect(): Argument #2 ($array2) must be of type array, int given
+array_intersect(): Argument #2 ($array2) must be of type array, int given
 
--- Iterator 5 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 5 --array_intersect(): Argument #2 ($array2) must be of type array, float given
+array_intersect(): Argument #2 ($array2) must be of type array, float given
 
--- Iterator 6 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 6 --array_intersect(): Argument #2 ($array2) must be of type array, float given
+array_intersect(): Argument #2 ($array2) must be of type array, float given
 
--- Iterator 7 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 7 --array_intersect(): Argument #2 ($array2) must be of type array, float given
+array_intersect(): Argument #2 ($array2) must be of type array, float given
 
--- Iterator 8 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 8 --array_intersect(): Argument #2 ($array2) must be of type array, float given
+array_intersect(): Argument #2 ($array2) must be of type array, float given
 
--- Iterator 9 --array_intersect(): Argument #2 ($arr2) must be of type array, float given
-array_intersect(): Argument #2 ($arr2) must be of type array, float given
+-- Iterator 9 --array_intersect(): Argument #2 ($array2) must be of type array, float given
+array_intersect(): Argument #2 ($array2) must be of type array, float given
 
--- Iterator 10 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 10 --array_intersect(): Argument #2 ($array2) must be of type array, null given
+array_intersect(): Argument #2 ($array2) must be of type array, null given
 
--- Iterator 11 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 11 --array_intersect(): Argument #2 ($array2) must be of type array, null given
+array_intersect(): Argument #2 ($array2) must be of type array, null given
 
--- Iterator 12 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 12 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
+array_intersect(): Argument #2 ($array2) must be of type array, bool given
 
--- Iterator 13 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 13 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
+array_intersect(): Argument #2 ($array2) must be of type array, bool given
 
--- Iterator 14 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 14 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
+array_intersect(): Argument #2 ($array2) must be of type array, bool given
 
--- Iterator 15 --array_intersect(): Argument #2 ($arr2) must be of type array, bool given
-array_intersect(): Argument #2 ($arr2) must be of type array, bool given
+-- Iterator 15 --array_intersect(): Argument #2 ($array2) must be of type array, bool given
+array_intersect(): Argument #2 ($array2) must be of type array, bool given
 
--- Iterator 16 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 16 --array_intersect(): Argument #2 ($array2) must be of type array, string given
+array_intersect(): Argument #2 ($array2) must be of type array, string given
 
--- Iterator 17 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 17 --array_intersect(): Argument #2 ($array2) must be of type array, string given
+array_intersect(): Argument #2 ($array2) must be of type array, string given
 
--- Iterator 18 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 18 --array_intersect(): Argument #2 ($array2) must be of type array, string given
+array_intersect(): Argument #2 ($array2) must be of type array, string given
 
--- Iterator 19 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 19 --array_intersect(): Argument #2 ($array2) must be of type array, string given
+array_intersect(): Argument #2 ($array2) must be of type array, string given
 
--- Iterator 20 --array_intersect(): Argument #2 ($arr2) must be of type array, string given
-array_intersect(): Argument #2 ($arr2) must be of type array, string given
+-- Iterator 20 --array_intersect(): Argument #2 ($array2) must be of type array, string given
+array_intersect(): Argument #2 ($array2) must be of type array, string given
 
--- Iterator 21 --array_intersect(): Argument #2 ($arr2) must be of type array, classA given
-array_intersect(): Argument #2 ($arr2) must be of type array, classA given
+-- Iterator 21 --array_intersect(): Argument #2 ($array2) must be of type array, classA given
+array_intersect(): Argument #2 ($array2) must be of type array, classA given
 
--- Iterator 22 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 22 --array_intersect(): Argument #2 ($array2) must be of type array, null given
+array_intersect(): Argument #2 ($array2) must be of type array, null given
 
--- Iterator 23 --array_intersect(): Argument #2 ($arr2) must be of type array, null given
-array_intersect(): Argument #2 ($arr2) must be of type array, null given
+-- Iterator 23 --array_intersect(): Argument #2 ($array2) must be of type array, null given
+array_intersect(): Argument #2 ($array2) must be of type array, null given
 
--- Iterator 24 --array_intersect(): Argument #2 ($arr2) must be of type array, resource given
-array_intersect(): Argument #2 ($arr2) must be of type array, resource given
+-- Iterator 24 --array_intersect(): Argument #2 ($array2) must be of type array, resource given
+array_intersect(): Argument #2 ($array2) must be of type array, resource given
 Done