From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 23 Jun 2020 16:52:16 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1d0eadc4d7c582a8bff77c16d04849c8ec7e8cf;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79487: ::getStaticProperties() ignores property modifications
---

f1d0eadc4d7c582a8bff77c16d04849c8ec7e8cf
diff --cc ext/reflection/php_reflection.c
index 0a116a0127,97066fb13e..b88712b7b5
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -3885,9 -3764,12 +3883,12 @@@ ZEND_METHOD(ReflectionClass, getStaticP
  {
  	reflection_object *intern;
  	zend_class_entry *ce;
+ 	zend_property_info *prop_info;
+ 	zval *prop;
+ 	zend_string *key;
  
  	if (zend_parse_parameters_none() == FAILURE) {
 -		return;
 +		RETURN_THROWS();
  	}
  
  	GET_REFLECTION_OBJECT_PTR(ce);