Merge branch 'PHP-7.1' into PHP-7.2

sgolemon · sgolemon · commit ff04db4420f0 · 2017-09-07T16:29:57.000-04:00
* PHP-7.1:
  Fix typo in zend_symtable_add_new() API name
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
@@ -1176,7 +1176,7 @@ ZEND_FUNCTION(get_object_vars)
 				 */
 				zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
 			} else {
-				zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value);
+				zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value);
 			}
 		} ZEND_HASH_FOREACH_END();
 	}
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
@@ -346,7 +346,7 @@ static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, cons
 			Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF);
 }
 
-static zend_always_inline zval *zend_symbtable_add_new(HashTable *ht, zend_string *key, zval *pData)
+static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string *key, zval *pData)
 {
 	zend_ulong idx;
 

Original file line number	Diff line number	Diff line change
`@@ -1176,7 +1176,7 @@ ZEND_FUNCTION(get_object_vars)`
`1176`	`1176`	`*/`
`1177`	`1177`	`zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);`
`1178`	`1178`	`} else {`
`1179`		`- zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value);`
	`1179`	`+ zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value);`
`1180`	`1180`	`}`
`1181`	`1181`	`} ZEND_HASH_FOREACH_END();`
`1182`	`1182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, cons`
`346`	`346`	`Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF);`
`347`	`347`	`}`
`348`	`348`
`349`		`-static zend_always_inline zval zend_symbtable_add_new(HashTable ht, zend_string key, zval pData)`
	`349`	`+static zend_always_inline zval zend_symtable_add_new(HashTable ht, zend_string key, zval pData)`
`350`	`350`	`{`
`351`	`351`	`zend_ulong idx;`
`352`	`352`