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

Merge branch 'PHP-7.4'

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

cf70026ebc49114cbe3dc553f8fbf36aa86b7459
diff --cc ext/reflection/php_reflection.c
index b88712b7b5,dbfb67386e..0a116a0127
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -3883,12 -3766,9 +3885,9 @@@ 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);