com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/reflectio n/php_reflection.c

From: Date: Fri, 22 Mar 2019 11:41:34 +0000
Subject: com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/reflectio n/php_reflection.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105303@lists.php.net to get a copy of this message
Commit: 9457cfca373f9e55eea8cf13ca39b4102003e7a8 Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 22 Mar 2019 12:41:34 +0100 Parents: d373c11e710b525feb6373629e3d1ebffef2dd5b 620a753185e575c8d48779764f376f6227b6e293 Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9457cfca373f9e55eea8cf13ca39b4102003e7a8 Log: Merge branch 'PHP-7.3' into PHP-7.4 Changed paths: MM ext/reflection/php_reflection.c Diff: diff --cc ext/reflection/php_reflection.c index 4c6f6f9,2fa073c..5f8faa3 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@@ -4153,10 -4191,10 +4153,11 @@@ ZEND_METHOD(reflection_class, getMethod { reflection_object *intern; zend_class_entry *ce; + zend_function *mptr; - 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; } @@@ -4332,13 -4382,16 +4337,18 @@@ ZEND_METHOD(reflection_class, getProper { reflection_object *intern; zend_class_entry *ce; + zend_string *key; + zend_property_info *prop_info; - 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);

« previous php.cvs (#105303) next »