Skip to content

Commit 1281c59

Browse files
kocsismatekocsismate
committed
Rename a few parameter names
1 parent bdebbfc commit 1281c59

File tree

7 files changed

+115
-116
lines changed

7 files changed

+115
-116
lines changed

‎Zend/tests/010.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ bool(false)
7575
string(3) "foo"
7676
bool(false)
7777
bool(false)
78-
get_parent_class(): Argument #1 ($object) must be a valid class name or object, string given
79-
get_parent_class(): Argument #1 ($object) must be a valid class name or object, string given
80-
get_parent_class(): Argument #1 ($object) must be a valid class name or object, string given
78+
get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given
79+
get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given
80+
get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, string given
8181
bool(false)
82-
get_parent_class(): Argument #1 ($object) must be a valid class name or object, array given
83-
get_parent_class(): Argument #1 ($object) must be a valid class name or object, int given
82+
get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, array given
83+
get_parent_class(): Argument #1 ($object_or_class) must be a valid class name or object, int given
8484
Done

‎Zend/tests/class_alias_006.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ try {
1111

1212
?>
1313
--EXPECT--
14-
class_alias(): Argument #1 ($original_class_name) must be a user-defined class name, internal class name given
14+
class_alias(): Argument #1 ($class) must be a user-defined class name, internal class name given

‎Zend/zend_builtin_functions.stub.php

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,37 @@ function get_class(object $object = UNKNOWN): string {}
3131

3232
function get_called_class(): string {}
3333

34-
function get_parent_class(string|object $object = UNKNOWN): string|false {}
34+
function get_parent_class(object|string $object_or_class = UNKNOWN): string|false {}
3535

36-
/** @param object|string $object */
37-
function is_subclass_of(mixed $object, string $class_name, bool $allow_string = true): bool {}
36+
/** @param object|string $object_or_class */
37+
function is_subclass_of(mixed $object_or_class, string $class, bool $allow_string = true): bool {}
3838

39-
/** @param object|string $object */
40-
function is_a(mixed $object, string $class_name, bool $allow_string = false): bool {}
39+
/** @param object|string $object_or_class */
40+
function is_a(mixed $object_or_class, string $class, bool $allow_string = false): bool {}
4141

42-
function get_class_vars(string $class_name): array|false {}
42+
function get_class_vars(string $class): array|false {}
4343

4444
function get_object_vars(object $object): array {}
4545

4646
function get_mangled_object_vars(object $object): array {}
4747

48-
/** string|object $class */
49-
function get_class_methods($class): array {}
48+
function get_class_methods(object|string $object_or_class): array {}
5049

5150
/** @param object|string $object_or_class */
5251
function method_exists(mixed $object_or_class, string $method): bool {}
5352

5453
/** @param object|string $object_or_class */
5554
function property_exists(mixed $object_or_class, string $property): bool {}
5655

57-
function class_exists(string $class_name, bool $autoload = true): bool {}
56+
function class_exists(string $class, bool $autoload = true): bool {}
5857

59-
function interface_exists(string $interface_name, bool $autoload = true): bool {}
58+
function interface_exists(string $interface, bool $autoload = true): bool {}
6059

61-
function trait_exists(string $trait_name, bool $autoload = true): bool {}
60+
function trait_exists(string $trait, bool $autoload = true): bool {}
6261

63-
function function_exists(string $function_name): bool {}
62+
function function_exists(string $function): bool {}
6463

65-
function class_alias(string $original_class_name, string $alias, bool $autoload = true): bool {}
64+
function class_alias(string $class, string $alias, bool $autoload = true): bool {}
6665

6766
function get_included_files(): array {}
6867

‎Zend/zend_builtin_functions_arginfo.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: b54cd767a1c2fd07865460fc9df8368ee988c823 */
2+
* Stub hash: d1ab4864c1159916b45c8f272a2a1d708b2dca65 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0)
55
ZEND_END_ARG_INFO()
@@ -54,23 +54,23 @@ ZEND_END_ARG_INFO()
5454
#define arginfo_get_called_class arginfo_zend_version
5555

5656
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_get_parent_class, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
57-
ZEND_ARG_TYPE_MASK(0, object, MAY_BE_STRING|MAY_BE_OBJECT, NULL)
57+
ZEND_ARG_TYPE_MASK(0, object_or_class, MAY_BE_OBJECT|MAY_BE_STRING, NULL)
5858
ZEND_END_ARG_INFO()
5959

6060
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_is_subclass_of, 0, 2, _IS_BOOL, 0)
61-
ZEND_ARG_TYPE_INFO(0, object, IS_MIXED, 0)
62-
ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
61+
ZEND_ARG_TYPE_INFO(0, object_or_class, IS_MIXED, 0)
62+
ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
6363
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, allow_string, _IS_BOOL, 0, "true")
6464
ZEND_END_ARG_INFO()
6565

6666
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_is_a, 0, 2, _IS_BOOL, 0)
67-
ZEND_ARG_TYPE_INFO(0, object, IS_MIXED, 0)
68-
ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
67+
ZEND_ARG_TYPE_INFO(0, object_or_class, IS_MIXED, 0)
68+
ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
6969
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, allow_string, _IS_BOOL, 0, "false")
7070
ZEND_END_ARG_INFO()
7171

7272
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_get_class_vars, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
73-
ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
73+
ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
7474
ZEND_END_ARG_INFO()
7575

7676
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_object_vars, 0, 1, IS_ARRAY, 0)
@@ -80,40 +80,40 @@ ZEND_END_ARG_INFO()
8080
#define arginfo_get_mangled_object_vars arginfo_get_object_vars
8181

8282
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_class_methods, 0, 1, IS_ARRAY, 0)
83-
ZEND_ARG_INFO(0, class)
83+
ZEND_ARG_TYPE_MASK(0, object_or_class, MAY_BE_OBJECT|MAY_BE_STRING, NULL)
8484
ZEND_END_ARG_INFO()
8585

8686
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_method_exists, 0, 2, _IS_BOOL, 0)
87-
ZEND_ARG_INFO(0, object_or_class)
87+
ZEND_ARG_TYPE_INFO(0, object_or_class, IS_MIXED, 0)
8888
ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0)
8989
ZEND_END_ARG_INFO()
9090

9191
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_property_exists, 0, 2, _IS_BOOL, 0)
92-
ZEND_ARG_INFO(0, object_or_class)
92+
ZEND_ARG_TYPE_INFO(0, object_or_class, IS_MIXED, 0)
9393
ZEND_ARG_TYPE_INFO(0, property, IS_STRING, 0)
9494
ZEND_END_ARG_INFO()
9595

9696
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_exists, 0, 1, _IS_BOOL, 0)
97-
ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 0)
97+
ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
9898
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload, _IS_BOOL, 0, "true")
9999
ZEND_END_ARG_INFO()
100100

101101
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_interface_exists, 0, 1, _IS_BOOL, 0)
102-
ZEND_ARG_TYPE_INFO(0, interface_name, IS_STRING, 0)
102+
ZEND_ARG_TYPE_INFO(0, interface, IS_STRING, 0)
103103
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload, _IS_BOOL, 0, "true")
104104
ZEND_END_ARG_INFO()
105105

106106
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_trait_exists, 0, 1, _IS_BOOL, 0)
107-
ZEND_ARG_TYPE_INFO(0, trait_name, IS_STRING, 0)
107+
ZEND_ARG_TYPE_INFO(0, trait, IS_STRING, 0)
108108
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload, _IS_BOOL, 0, "true")
109109
ZEND_END_ARG_INFO()
110110

111111
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_function_exists, 0, 1, _IS_BOOL, 0)
112-
ZEND_ARG_TYPE_INFO(0, function_name, IS_STRING, 0)
112+
ZEND_ARG_TYPE_INFO(0, function, IS_STRING, 0)
113113
ZEND_END_ARG_INFO()
114114

115115
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_alias, 0, 2, _IS_BOOL, 0)
116-
ZEND_ARG_TYPE_INFO(0, original_class_name, IS_STRING, 0)
116+
ZEND_ARG_TYPE_INFO(0, class, IS_STRING, 0)
117117
ZEND_ARG_TYPE_INFO(0, alias, IS_STRING, 0)
118118
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, autoload, _IS_BOOL, 0, "true")
119119
ZEND_END_ARG_INFO()

‎ext/standard/tests/class_object/get_class_methods_basic_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ Argument is name of class which has no methods:
5757
array(0) {
5858
}
5959
Argument is non existent class:
60-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, string given
60+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given
6161
Done

‎ext/standard/tests/class_object/get_class_methods_variation_001.phpt

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -69,104 +69,104 @@ $values = array(
6969
// loop through each element of the array for class
7070

7171
foreach($values as $value) {
72-
echo "\nArg value " . (is_object($value) ? get_class($value) : $value) . " \n";
72+
echo "\nArg value " . (is_object($value) ? get_class($value) : $value) . "\n";
7373
try {
7474
var_dump( get_class_methods($value) );
7575
} catch (TypeError $exception) {
7676
echo $exception->getMessage() . "\n";
7777
}
78-
};
78+
}
7979
echo "Done";
8080
?>
8181
--EXPECT--
8282
*** Testing get_class_methods() : usage variations ***
8383
Error: 2 - Undefined variable $undefined_var
8484
Error: 2 - Undefined variable $unset_var
8585

86-
Arg value 0
87-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, int given
86+
Arg value 0
87+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given
8888

89-
Arg value 1
90-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, int given
89+
Arg value 1
90+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given
9191

92-
Arg value 12345
93-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, int given
92+
Arg value 12345
93+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given
9494

95-
Arg value -2345
96-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, int given
95+
Arg value -2345
96+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, int given
9797

98-
Arg value 10.5
99-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, float given
98+
Arg value 10.5
99+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given
100100

101-
Arg value -10.5
102-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, float given
101+
Arg value -10.5
102+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given
103103

104-
Arg value 101234567000
105-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, float given
104+
Arg value 101234567000
105+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given
106106

107-
Arg value 1.07654321E-9
108-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, float given
107+
Arg value 1.07654321E-9
108+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given
109109

110-
Arg value 0.5
111-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, float given
110+
Arg value 0.5
111+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, float given
112112
Error: 2 - Array to string conversion
113113

114-
Arg value Array
115-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, array given
114+
Arg value Array
115+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given
116116
Error: 2 - Array to string conversion
117117

118-
Arg value Array
119-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, array given
118+
Arg value Array
119+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given
120120
Error: 2 - Array to string conversion
121121

122-
Arg value Array
123-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, array given
122+
Arg value Array
123+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given
124124
Error: 2 - Array to string conversion
125125

126-
Arg value Array
127-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, array given
126+
Arg value Array
127+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given
128128
Error: 2 - Array to string conversion
129129

130-
Arg value Array
131-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, array given
130+
Arg value Array
131+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, array given
132132

133-
Arg value
134-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, null given
133+
Arg value
134+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given
135135

136-
Arg value
137-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, null given
136+
Arg value
137+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given
138138

139-
Arg value 1
140-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, bool given
139+
Arg value 1
140+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given
141141

142-
Arg value
143-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, bool given
142+
Arg value
143+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given
144144

145-
Arg value 1
146-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, bool given
145+
Arg value 1
146+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given
147147

148-
Arg value
149-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, bool given
148+
Arg value
149+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, bool given
150150

151-
Arg value
152-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, string given
151+
Arg value
152+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given
153153

154-
Arg value
155-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, string given
154+
Arg value
155+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given
156156

157-
Arg value string
158-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, string given
157+
Arg value string
158+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given
159159

160-
Arg value string
161-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, string given
160+
Arg value string
161+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, string given
162162

163-
Arg value stdClass
163+
Arg value stdClass
164164
array(0) {
165165
}
166166

167-
Arg value
168-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, null given
167+
Arg value
168+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given
169169

170-
Arg value
171-
get_class_methods(): Argument #1 ($class) must be a valid class name or object, null given
170+
Arg value
171+
get_class_methods(): Argument #1 ($object_or_class) must be a valid class name or object, null given
172172
Done

0 commit comments

Comments
 (0)