Skip to content

Commit 3dfbd22

Browse files
committed
Reflection param renames amendment
1 parent 7553c69 commit 3dfbd22

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

ext/reflection/php_reflection.stub.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public function getDeclaringClass() {}
194194
public function getPrototype() {}
195195

196196
/** @return void */
197-
public function setAccessible(bool $isAccessible) {}
197+
public function setAccessible(bool $accessible) {}
198198
}
199199

200200
class ReflectionClass implements Reflector
@@ -254,16 +254,16 @@ public function hasProperty(string $name) {}
254254
public function getProperty(string $name) {}
255255

256256
/** @return ReflectionProperty[] */
257-
public function getProperties(?int $filter = null) {}
257+
public function getProperties(?int $modifiers = null) {}
258258

259259
/** @return bool */
260260
public function hasConstant(string $name) {}
261261

262262
/** @return array|null */
263-
public function getConstants(int $filter = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE) {}
263+
public function getConstants(int $modifiers = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE) {}
264264

265265
/** @return ReflectionClassConstant[] */
266-
public function getReflectionConstants(int $filter = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE) {}
266+
public function getReflectionConstants(int $modifiers = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE) {}
267267

268268
/** @return mixed */
269269
public function getConstant(string $name) {}
@@ -364,7 +364,7 @@ public function getAttributes(?string $name = null, int $flags = 0): array {}
364364

365365
class ReflectionObject extends ReflectionClass
366366
{
367-
public function __construct(object $argument) {}
367+
public function __construct(object $object) {}
368368
}
369369

370370
class ReflectionProperty implements Reflector
@@ -415,7 +415,7 @@ public function getDeclaringClass() {}
415415
public function getDocComment() {}
416416

417417
/** @return void */
418-
public function setAccessible(bool $isAccessible) {}
418+
public function setAccessible(bool $accessible) {}
419419

420420
/** @return ReflectionType|null */
421421
public function getType() {}
@@ -475,7 +475,7 @@ class ReflectionParameter implements Reflector
475475
final private function __clone() {}
476476

477477
/** @param string|array|object $function */
478-
public function __construct($function, int|string $parameter) {}
478+
public function __construct($function, int|string $param) {}
479479

480480
public function __toString(): string {}
481481

ext/reflection/php_reflection_arginfo.h

Lines changed: 8 additions & 8 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: 35e17de0cdf6c11a315f6d10fd711492d1da567c */
2+
* Stub hash: 7a05b86697bef8c44f537ff37f47764c0fa6be3f */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
@@ -144,7 +144,7 @@ ZEND_END_ARG_INFO()
144144
#define arginfo_class_ReflectionMethod_getPrototype arginfo_class_ReflectionFunctionAbstract___clone
145145

146146
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ReflectionMethod_setAccessible, 0, 0, 1)
147-
ZEND_ARG_TYPE_INFO(0, isAccessible, _IS_BOOL, 0)
147+
ZEND_ARG_TYPE_INFO(0, accessible, _IS_BOOL, 0)
148148
ZEND_END_ARG_INFO()
149149

150150
#define arginfo_class_ReflectionClass___clone arginfo_class_ReflectionFunctionAbstract___clone
@@ -191,12 +191,14 @@ ZEND_END_ARG_INFO()
191191

192192
#define arginfo_class_ReflectionClass_getProperty arginfo_class_ReflectionClass_hasMethod
193193

194-
#define arginfo_class_ReflectionClass_getProperties arginfo_class_ReflectionClass_getMethods
194+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ReflectionClass_getProperties, 0, 0, 0)
195+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, modifiers, IS_LONG, 1, "null")
196+
ZEND_END_ARG_INFO()
195197

196198
#define arginfo_class_ReflectionClass_hasConstant arginfo_class_ReflectionClass_hasMethod
197199

198200
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ReflectionClass_getConstants, 0, 0, 0)
199-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filter, IS_LONG, 0, "ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE")
201+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, modifiers, IS_LONG, 0, "ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE")
200202
ZEND_END_ARG_INFO()
201203

202204
#define arginfo_class_ReflectionClass_getReflectionConstants arginfo_class_ReflectionClass_getConstants
@@ -277,9 +279,7 @@ ZEND_END_ARG_INFO()
277279

278280
#define arginfo_class_ReflectionClass_getAttributes arginfo_class_ReflectionFunctionAbstract_getAttributes
279281

280-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ReflectionObject___construct, 0, 0, 1)
281-
ZEND_ARG_TYPE_INFO(0, argument, IS_OBJECT, 0)
282-
ZEND_END_ARG_INFO()
282+
#define arginfo_class_ReflectionObject___construct arginfo_class_ReflectionClass_isInstance
283283

284284
#define arginfo_class_ReflectionProperty___clone arginfo_class_ReflectionFunctionAbstract___clone
285285

@@ -363,7 +363,7 @@ ZEND_END_ARG_INFO()
363363

364364
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ReflectionParameter___construct, 0, 0, 2)
365365
ZEND_ARG_INFO(0, function)
366-
ZEND_ARG_TYPE_MASK(0, parameter, MAY_BE_LONG|MAY_BE_STRING, NULL)
366+
ZEND_ARG_TYPE_MASK(0, param, MAY_BE_LONG|MAY_BE_STRING, NULL)
367367
ZEND_END_ARG_INFO()
368368

369369
#define arginfo_class_ReflectionParameter___toString arginfo_class_ReflectionFunction___toString

ext/reflection/tests/ReflectionClass_toString_001.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector, String
152152
Method [ <internal:Reflection> public method getProperties ] {
153153

154154
- Parameters [1] {
155-
Parameter #0 [ <optional> ?int $filter = null ]
155+
Parameter #0 [ <optional> ?int $modifiers = null ]
156156
}
157157
}
158158

@@ -166,14 +166,14 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector, String
166166
Method [ <internal:Reflection> public method getConstants ] {
167167

168168
- Parameters [1] {
169-
Parameter #0 [ <optional> int $filter = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE ]
169+
Parameter #0 [ <optional> int $modifiers = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE ]
170170
}
171171
}
172172

173173
Method [ <internal:Reflection> public method getReflectionConstants ] {
174174

175175
- Parameters [1] {
176-
Parameter #0 [ <optional> int $filter = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE ]
176+
Parameter #0 [ <optional> int $modifiers = ReflectionClassConstant::IS_PUBLIC | ReflectionClassConstant::IS_PROTECTED | ReflectionClassConstant::IS_PRIVATE ]
177177
}
178178
}
179179

ext/reflection/tests/parameters_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ int(1)
3939
bool(false)
4040
bool(true)
4141
string(54) "The parameter specified by its name could not be found"
42-
string(95) "ReflectionParameter::__construct(): Argument #2 ($parameter) must be greater than or equal to 0"
42+
string(91) "ReflectionParameter::__construct(): Argument #2 ($param) must be greater than or equal to 0"

0 commit comments

Comments
 (0)