Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix typo in zend_symtable_add_new() API name

diff --cc Zend/zend_builtin_functions.c
index aebe2b121c58a630b0f159b67534bb7d7547513a,1c656a7ad0be4613382bab161e244534b05cbb20..e09310239f7e4fd85c24bd6f88460a1c5350d213
--- 1/Zend/zend_builtin_functions.c
--- 2/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@@ -1142,41 -1265,24 +1142,41 @@@ ZEND_FUNCTION(get_object_vars
        } else {
                array_init_size(return_value, zend_hash_num_elements(properties));
  
 -              ZEND_HASH_FOREACH_STR_KEY_VAL_IND(properties, key, value) {
 -                      if (key) {
 -                              if (zend_check_property_access(zobj, key) == SUCCESS) {
 -                                      if (Z_ISREF_P(value) && Z_REFCOUNT_P(value) == 1) {
 -                                              value = Z_REFVAL_P(value);
 -                                      }
 -                                      if (Z_REFCOUNTED_P(value)) {
 -                                              Z_ADDREF_P(value);
 -                                      }
 -                                      if (ZSTR_VAL(key)[0] == 0) {
 -                                              const char *prop_name, *class_name;
 -                                              size_t prop_len;
 -                                              zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_len);
 -                                              zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
 -                                      } else {
 -                                              zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value);
 -                                      }
 +              ZEND_HASH_FOREACH_KEY_VAL(properties, num_key, key, value) {
 +                      zend_bool unmangle = 0;
 +                      if (Z_TYPE_P(value) == IS_INDIRECT) {
 +                              value = Z_INDIRECT_P(value);
 +                              if (UNEXPECTED(Z_ISUNDEF_P(value))) {
 +                                      continue;
                                }
-                               zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value);
 +
 +                              ZEND_ASSERT(key);
 +                              if (zend_check_property_access(zobj, key) == FAILURE) {
 +                                      continue;
 +                              }
 +                              unmangle = 1;
 +                      }
 +
 +                      if (Z_ISREF_P(value) && Z_REFCOUNT_P(value) == 1) {
 +                              value = Z_REFVAL_P(value);
 +                      }
 +                      Z_TRY_ADDREF_P(value);
 +
 +                      if (UNEXPECTED(!key)) {
 +                              /* This case is only possible due to loopholes, e.g. ArrayObject */
 +                              zend_hash_index_add(Z_ARRVAL_P(return_value), num_key, value);
 +                      } else if (unmangle && ZSTR_VAL(key)[0] == 0) {
 +                              const char *prop_name, *class_name;
 +                              size_t prop_len;
 +                              zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_len);
 +                              /* We assume here that a mangled property name is never
 +                               * numeric. This is probably a safe assumption, but
 +                               * theoretically someone might write an extension with
 +                               * private, numeric properties. Well, too bad.
 +                               */
 +                              zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
 +                      } else {
++                              zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value);
                        }
                } ZEND_HASH_FOREACH_END();
        }

diff --cc Zend/zend_hash.h
Simple merge