diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 67c779ea637c..ff5c2f5c84c2 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -45,6 +45,13 @@ PHP 8.5 INTERNALS UPGRADE NOTES properties. . ZEND_IS_XDIGIT() macro was removed because it was unused and its name did not match its actual behavior. + . The following zend_string-related legacy aliases were removed: + * IS_INTERNED() - use ZSTR_IS_INTERNED() + * STR_EMPTY_ALLOC() - use ZSTR_EMPTY_ALLOC() + * _STR_HEADER_SIZE - use _ZSTR_HEADER_SIZE + * STR_ALLOCA_ALLOC() - use ZSTR_ALLOCA_ALLOC() + * STR_ALLOCA_INIT() - use ZSTR_ALLOCA_INIT() + * STR_ALLOCA_FREE() - use ZSTR_ALLOCA_FREE() . zend_register_constant() now returns a pointer to the added constant on success and NULL on failure instead of SUCCESS/FAILURE. diff --git a/Zend/zend_string.h b/Zend/zend_string.h index f60e4dec4e71..ac9a7465c876 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -70,15 +70,6 @@ END_EXTERN_C() #define ZSTR_H(zstr) (zstr)->h #define ZSTR_HASH(zstr) zend_string_hash_val(zstr) -/* Compatibility macros */ - -#define IS_INTERNED(s) ZSTR_IS_INTERNED(s) -#define STR_EMPTY_ALLOC() ZSTR_EMPTY_ALLOC() -#define _STR_HEADER_SIZE _ZSTR_HEADER_SIZE -#define STR_ALLOCA_ALLOC(str, _len, use_heap) ZSTR_ALLOCA_ALLOC(str, _len, use_heap) -#define STR_ALLOCA_INIT(str, s, len, use_heap) ZSTR_ALLOCA_INIT(str, s, len, use_heap) -#define STR_ALLOCA_FREE(str, use_heap) ZSTR_ALLOCA_FREE(str, use_heap) - /*---*/ #define ZSTR_IS_INTERNED(s) (GC_FLAGS(s) & IS_STR_INTERNED)