From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 27 May 2017 04:08:48 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~43^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd3520c4d3d9639f05e6685004535a25408f8422;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74657 (Undefined constants in array properties result in broken properties)
---

cd3520c4d3d9639f05e6685004535a25408f8422
diff --cc Zend/zend_API.c
index d73ad76fcb,4f9f4f9b46..323e10160d
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -1157,8 -1157,13 +1155,11 @@@ ZEND_API int zend_update_class_constant
  				} ZEND_HASH_FOREACH_END();
  				ce = ce->parent;
  			}
 -
 -			*scope = old_scope;
  		}
  	}
+ 
+ 	class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
+ 
  	return SUCCESS;
  }
  /* }}} */