Merge branch 'PHP-7.0' into PHP-7.1

laruence · laruence · commit 1838f965bc13 · 2017-05-27T12:12:12.000+08:00
* PHP-7.0:
  Correct the location
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -1156,10 +1156,9 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */
 				ce = ce->parent;
 			}
 		}
+		class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
 	}
 
-	class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
-
 	return SUCCESS;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -1156,10 +1156,9 @@ ZEND_API int zend_update_class_constants(zend_class_entry class_type) / {{{ */`
`1156`	`1156`	`ce = ce->parent;`
`1157`	`1157`	`}`
`1158`	`1158`	`}`
	`1159`	`+ class_type->ce_flags \|= ZEND_ACC_CONSTANTS_UPDATED;`
`1159`	`1160`	`}`
`1160`	`1161`
`1161`		`- class_type->ce_flags \|= ZEND_ACC_CONSTANTS_UPDATED;`
`1162`		`-`
`1163`	`1162`	`return SUCCESS;`
`1164`	`1163`	`}`
`1165`	`1164`	`/* }}} */`