From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 22 Mar 2019 11:41:34 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9457cfca373f9e55eea8cf13ca39b4102003e7a8;p=php

Merge branch 'PHP-7.3' into PHP-7.4
---

9457cfca373f9e55eea8cf13ca39b4102003e7a8
diff --cc ext/reflection/php_reflection.c
index 4c6f6f9aa4,2fa073cbea..5f8faa39b7
--- 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);