diff options
| -rw-r--r-- | UPGRADING.INTERNALS | 4 | ||||
| -rw-r--r-- | Zend/zend_API.c | 65 | ||||
| -rw-r--r-- | Zend/zend_API.h | 12 |
3 files changed, 4 insertions, 77 deletions
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 8488bc8062..dc3f6c2f9b 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -10,6 +10,7 @@ PHP 7.4 INTERNALS UPGRADE NOTES g. Required object handlers h. Immutable classes and op_arrays i. php_fgetcsv() and php_fputcsv() + j. Removed add_get_assoc_*() and add_get_index_*() 2. Build system changes a. Abstract @@ -142,6 +143,9 @@ PHP 7.4 INTERNALS UPGRADE NOTES PHP_CSV_NO_ESCAPE to this parameter, to disable PHP's proprietary escape mechanism. + j. add_get_assoc_*() and add_get_index_*() are removed. Use add_assoc*(), + add_index*() or zend_hash_*() API functions instead. + ======================== 2. Build system changes ======================== diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 4e6f0f9de3..fc33d93791 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1601,71 +1601,6 @@ ZEND_API int add_next_index_stringl(zval *arg, const char *str, size_t length) / } /* }}} */ -ZEND_API zval *add_get_assoc_string_ex(zval *arg, const char *key, uint32_t key_len, const char *str) /* {{{ */ -{ - zval tmp, *ret; - - ZVAL_STRING(&tmp, str); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret; -} -/* }}} */ - -ZEND_API zval *add_get_assoc_stringl_ex(zval *arg, const char *key, uint32_t key_len, const char *str, size_t length) /* {{{ */ -{ - zval tmp, *ret; - - ZVAL_STRINGL(&tmp, str, length); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret; -} -/* }}} */ - -ZEND_API zval *add_get_index_long(zval *arg, zend_ulong index, zend_long l) /* {{{ */ -{ - zval tmp; - - ZVAL_LONG(&tmp, l); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); -} -/* }}} */ - -ZEND_API zval *add_get_index_double(zval *arg, zend_ulong index, double d) /* {{{ */ -{ - zval tmp; - - ZVAL_DOUBLE(&tmp, d); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); -} -/* }}} */ - -ZEND_API zval *add_get_index_str(zval *arg, zend_ulong index, zend_string *str) /* {{{ */ -{ - zval tmp; - - ZVAL_STR(&tmp, str); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); -} -/* }}} */ - -ZEND_API zval *add_get_index_string(zval *arg, zend_ulong index, const char *str) /* {{{ */ -{ - zval tmp; - - ZVAL_STRING(&tmp, str); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); -} -/* }}} */ - -ZEND_API zval *add_get_index_stringl(zval *arg, zend_ulong index, const char *str, size_t length) /* {{{ */ -{ - zval tmp; - - ZVAL_STRINGL(&tmp, str, length); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); -} -/* }}} */ - ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value) /* {{{ */ { zval *result; diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 341d28c153..4c1bbbf41e 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -428,18 +428,6 @@ ZEND_API int add_next_index_stringl(zval *arg, const char *str, size_t length); #define add_next_index_zval(arg, value) \ (zend_hash_next_index_insert(Z_ARRVAL_P(arg), value) ? SUCCESS : FAILURE) -ZEND_API zval *add_get_assoc_string_ex(zval *arg, const char *key, uint32_t key_len, const char *str); -ZEND_API zval *add_get_assoc_stringl_ex(zval *arg, const char *key, uint32_t key_len, const char *str, size_t length); - -#define add_get_assoc_string(__arg, __key, __str) add_get_assoc_string_ex(__arg, __key, strlen(__key), __str) -#define add_get_assoc_stringl(__arg, __key, __str, __length) add_get_assoc_stringl_ex(__arg, __key, strlen(__key), __str, __length) - -ZEND_API zval *add_get_index_long(zval *arg, zend_ulong idx, zend_long l); -ZEND_API zval *add_get_index_double(zval *arg, zend_ulong idx, double d); -ZEND_API zval *add_get_index_str(zval *arg, zend_ulong index, zend_string *str); -ZEND_API zval *add_get_index_string(zval *arg, zend_ulong idx, const char *str); -ZEND_API zval *add_get_index_stringl(zval *arg, zend_ulong idx, const char *str, size_t length); - ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value); ZEND_API int add_property_long_ex(zval *arg, const char *key, size_t key_len, zend_long l); |