]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Tue, 23 Jun 2020 17:30:12 +0000 (19:30 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Tue, 23 Jun 2020 17:30:12 +0000 (19:30 +0200)
* PHP-7.4:
  Revert "Fix #79487: ::getStaticProperties() ignores property modifications"

1  2 
ext/reflection/php_reflection.c

index b88712b7b5463d2c3575dc58d322c4bd1f8fc25a,dbfb67386e9bf2e73ff257b5029e7ff80a3d82af..0a116a012797b459f10c1013b215b4e02f148b1c
@@@ -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);