summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorTyson Andre <tysonandre775@hotmail.com>2020-08-10 19:48:41 -0400
committerTyson Andre <tysonandre775@hotmail.com>2020-08-11 19:11:59 -0400
commit1e9a5c67ef6d075df16d4183abf62e4c99b2f8c6 (patch)
tree351c1da7bb1c24ad030f5a18edc89c795e27cc22 /Zend
parent10f660f0a51812ac62e8f03895944e895e553240 (diff)
downloadphp-git-1e9a5c67ef6d075df16d4183abf62e4c99b2f8c6.tar.gz
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.
Diffstat (limited to 'Zend')
-rw-r--r--Zend/tests/call_user_func_009.phpt4
-rw-r--r--Zend/tests/named_params/internal.phpt6
-rw-r--r--Zend/tests/named_params/missing_param.phpt2
-rw-r--r--Zend/tests/nullsafe_operator/013.phpt2
4 files changed, 7 insertions, 7 deletions
diff --git a/Zend/tests/call_user_func_009.phpt b/Zend/tests/call_user_func_009.phpt
index 6f2ec7a4b6..7224dc06fa 100644
--- a/Zend/tests/call_user_func_009.phpt
+++ b/Zend/tests/call_user_func_009.phpt
@@ -10,8 +10,8 @@ var_dump(\call_user_func('sort', []));
?>
--EXPECTF--
-Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d
+Warning: sort(): Argument #1 ($array) must be passed by reference, value given in %s on line %d
bool(true)
-Warning: sort(): Argument #1 ($arg) must be passed by reference, value given in %s on line %d
+Warning: sort(): Argument #1 ($array) must be passed by reference, value given in %s on line %d
bool(true)
diff --git a/Zend/tests/named_params/internal.phpt b/Zend/tests/named_params/internal.phpt
index 97260c2564..d9fef27c93 100644
--- a/Zend/tests/named_params/internal.phpt
+++ b/Zend/tests/named_params/internal.phpt
@@ -3,10 +3,10 @@ Named params on internal functions
--FILE--
<?php
-var_dump(array_slice(arg: [1, 2, 3, 4, 5], offset: 2, length: 2));
-var_dump(array_slice(length: 2, offset: 2, arg: [1, 2, 3, 4, 5]));
+var_dump(array_slice(array: [1, 2, 3, 4, 5], offset: 2, length: 2));
+var_dump(array_slice(length: 2, offset: 2, array: [1, 2, 3, 4, 5]));
-var_dump(array_slice(arg: ['a' => 0, 'b' => 1], offset: 1, preserve_keys: true));
+var_dump(array_slice(array: ['a' => 0, 'b' => 1], offset: 1, preserve_keys: true));
var_dump(array_slice(['a' => 0, 'b' => 1], preserve_keys: true, offset: 1));
var_dump(str_pad("foo", 6, pad_type: STR_PAD_LEFT));
diff --git a/Zend/tests/named_params/missing_param.phpt b/Zend/tests/named_params/missing_param.phpt
index 52dc1b1a54..3ee2feae0a 100644
--- a/Zend/tests/named_params/missing_param.phpt
+++ b/Zend/tests/named_params/missing_param.phpt
@@ -30,7 +30,7 @@ var_dump(array_keys([41, 42], search_value: 42, strict: true));
?>
--EXPECT--
test(): Argument #2 ($b) not passed
-array_keys(): Argument #1 ($arg) not passed
+array_keys(): Argument #1 ($array) not passed
array_keys(): Argument #2 ($search_value) must be passed explicitly, because the default value is not known
array(1) {
[0]=>
diff --git a/Zend/tests/nullsafe_operator/013.phpt b/Zend/tests/nullsafe_operator/013.phpt
index 1210113774..0fef34b2b7 100644
--- a/Zend/tests/nullsafe_operator/013.phpt
+++ b/Zend/tests/nullsafe_operator/013.phpt
@@ -54,7 +54,7 @@ string(56) "get_called_class() expects exactly 0 parameters, 1 given"
string(4) "NULL"
string(53) "func_num_args() expects exactly 0 parameters, 1 given"
string(53) "func_get_args() expects exactly 0 parameters, 1 given"
-string(67) "array_slice(): Argument #1 ($arg) must be of type array, null given"
+string(69) "array_slice(): Argument #1 ($array) must be of type array, null given"
array(1) {
[0]=>
string(3) "foo"