diff options
Diffstat (limited to 'ext/reflection')
| -rw-r--r-- | ext/reflection/php_reflection.c | 18 | ||||
| -rw-r--r-- | ext/reflection/tests/bug77772.phpt | 22 |
2 files changed, 36 insertions, 4 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 748f5b3f08..2fa073cbea 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4191,12 +4191,17 @@ ZEND_METHOD(reflection_class, getMethods) { reflection_object *intern; zend_class_entry *ce; - zend_long filter = ZEND_ACC_PPP_MASK | ZEND_ACC_ABSTRACT | ZEND_ACC_FINAL | ZEND_ACC_STATIC; + zend_long filter = 0; + zend_bool filter_is_null = 1; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &filter) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l!", &filter, &filter_is_null) == FAILURE) { return; } + if (filter_is_null) { + filter = ZEND_ACC_PPP_MASK | ZEND_ACC_ABSTRACT | ZEND_ACC_FINAL | ZEND_ACC_STATIC; + } + GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); @@ -4377,11 +4382,16 @@ ZEND_METHOD(reflection_class, getProperties) { reflection_object *intern; zend_class_entry *ce; - zend_long filter = ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC; + zend_long filter = 0; + zend_bool filter_is_null = 1; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &filter) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l!", &filter, &filter_is_null) == FAILURE) { return; } + + if (filter_is_null) { + filter = ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC; + } GET_REFLECTION_OBJECT_PTR(ce); diff --git a/ext/reflection/tests/bug77772.phpt b/ext/reflection/tests/bug77772.phpt new file mode 100644 index 0000000000..07696210c5 --- /dev/null +++ b/ext/reflection/tests/bug77772.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #77772: ReflectionClass::getMethods(null) doesn't work +--FILE-- +<?php + +class Test { + public $prop; + public function method() {} +} + +$rc = new ReflectionClass(Test::class); +foreach ($rc->getMethods(null) as $method) { + var_dump($method->getName()); +} +foreach ($rc->getProperties(null) as $prop) { + var_dump($prop->getName()); +} + +?> +--EXPECT-- +string(6) "method" +string(4) "prop" |