Merge branch 'PHP-7.1'

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

2 files changed, 29 insertions, 2 deletions

diff --git a/Zend/tests/bug74657.phpt b/Zend/tests/bug74657.phpt
new file mode 100644
index 0000000000..41e28ce58b
--- /dev/null
+++ b/Zend/tests/bug74657.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Bug #74657 (Undefined constants in array properties result in broken properties)
+--FILE--
+<?php
+
+interface I {
+}
+
+class C {
+	const FOO = I::FOO;
+
+	public $options = [self::FOO => "bar"];
+}
+
+try {
+	var_dump((new C)->options);
+} catch (Throwable $e) {}
+
+var_dump((new C)->options);
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Undefined class constant 'I::FOO' in %sbug74657.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug74657.php on line %d
+
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index c95d462872..78985a777a 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1118,8 +1118,6 @@ ZEND_API void zend_merge_properties(zval *obj, HashTable *properties) /* {{{ */
 ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */
 {
 	if (!(class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
-		class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
-
 		if (class_type->parent) {
 			if (UNEXPECTED(zend_update_class_constants(class_type->parent) != SUCCESS)) {
 				return FAILURE;
@@ -1189,6 +1187,9 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */
 			}
 		}
 	}
+
+	class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
+
 	return SUCCESS;
 }
 /* }}} */