Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Correct the location

diff --cc Zend/zend_API.c
index 323e10160d3b317c4911af316907450e46b0e2ad,43c6209ba401504127c146c73a25de8a8ede5484..8d5ef2b0b96ff9ed76d80410b907ccd870b32b22
--- 1/Zend/zend_API.c
--- 2/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -1155,11 -1157,12 +1155,10 @@@ 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;
        }
  
-       class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
- 
        return SUCCESS;
  }
  /* }}} */