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_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
index 8e70444ce3..2bae7fb4a9 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test array_intersect_assoc() function : usage variations - unexpected values for 'arr1' argument(Bug#43196)
+Test array_intersect_assoc() function : usage variations - unexpected values for 'array1' argument(Bug#43196)
 --FILE--
 <?php
 /*
-* Testing array_intersect_assoc() function by passing values to $arr1 argument other than arrays
+* Testing array_intersect_assoc() function by passing values to $array1 argument other than arrays
 * and see that function emits proper warning messages wherever expected.
-* The $arr2 argument passed is a fixed array.
+* The $array2 argument passed is a fixed array.
 */
 
-echo "*** Testing array_intersect_assoc() : Passing non-array values to \$arr1 argument ***\n";
+echo "*** Testing array_intersect_assoc() : Passing non-array values to \$array1 argument ***\n";
 
-// array to be passsed to $arr2 as default argument
-$arr2 = array(1, 2);
+// array to be passsed to $array2 as default argument
+$array2 = array(1, 2);
 
 // additional array to be passed for intersection
 $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 $arr1 argument
+// unexpected values to be passed to $array1 argument
 $arrays = array(
 
        // int data
@@ -91,14 +91,14 @@ foreach($arrays as $unexpected_value) {
 
     // Calling array_intersect_assoc() with default arguments
     try {
-        var_dump( array_intersect_assoc($unexpected_value, $arr2) );
+        var_dump( array_intersect_assoc($unexpected_value, $array2) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
 
     // Calling array_intersect_assoc() with more arguments
     try {
-        var_dump( array_intersect_assoc($unexpected_value, $arr2, $arr3) );
+        var_dump( array_intersect_assoc($unexpected_value, $array2, $arr3) );
     } catch (TypeError $e) {
         echo $e->getMessage(), "\n";
     }
@@ -111,77 +111,77 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECT--
-*** Testing array_intersect_assoc() : Passing non-array values to $arr1 argument ***
+*** Testing array_intersect_assoc() : Passing non-array values to $array1 argument ***
 
--- Iteration 1 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 1 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 2 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 2 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 3 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 3 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 4 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, int given
+-- Iteration 4 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, int given
 
--- Iteration 5 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 5 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 6 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 6 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 7 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 7 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 8 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 8 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 9 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, float given
+-- Iteration 9 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, float given
 
--- Iteration 10 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 10 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 11 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 11 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 12 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 12 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 13 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 13 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 14 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 14 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 15 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, bool given
+-- Iteration 15 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, bool given
 
--- Iteration 16 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 16 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 17 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 17 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 18 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 18 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 19 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 19 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 20 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, string given
+-- Iteration 20 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, string given
 
--- Iteration 21 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, classA given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, classA given
+-- Iteration 21 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, classA given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, classA given
 
--- Iteration 22 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 22 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 23 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, null given
+-- Iteration 23 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, null given
 
--- Iteration 24 --array_intersect_assoc(): Argument #1 ($arr1) must be of type array, resource given
-array_intersect_assoc(): Argument #1 ($arr1) must be of type array, resource given
+-- Iteration 24 --array_intersect_assoc(): Argument #1 ($array1) must be of type array, resource given
+array_intersect_assoc(): Argument #1 ($array1) must be of type array, resource given
 Done