Skip to content

Commit 417cd75

Browse files
Remove old zend_string compatibility aliases
1 parent 4e42ad5 commit 417cd75

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

UPGRADING.INTERNALS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ PHP 8.5 INTERNALS UPGRADE NOTES
4545
properties.
4646
. ZEND_IS_XDIGIT() macro was removed because it was unused and its name
4747
did not match its actual behavior.
48+
. The following zend_string-related legacy aliases were removed:
49+
* IS_INTERNED() - use ZSTR_IS_INTERNED()
50+
* STR_EMPTY_ALLOC() - use ZSTR_EMPTY_ALLOC()
51+
* _STR_HEADER_SIZE - use _ZSTR_HEADER_SIZE
52+
* STR_ALLOCA_ALLOC() - use ZSTR_ALLOCA_ALLOC()
53+
* STR_ALLOCA_INIT() - use ZSTR_ALLOCA_INIT()
54+
* STR_ALLOCA_FREE() - use ZSTR_ALLOCA_FREE()
4855
. zend_register_constant() now returns a pointer to the added constant
4956
on success and NULL on failure instead of SUCCESS/FAILURE.
5057

Zend/zend_string.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@ END_EXTERN_C()
7070
#define ZSTR_H(zstr) (zstr)->h
7171
#define ZSTR_HASH(zstr) zend_string_hash_val(zstr)
7272

73-
/* Compatibility macros */
74-
75-
#define IS_INTERNED(s) ZSTR_IS_INTERNED(s)
76-
#define STR_EMPTY_ALLOC() ZSTR_EMPTY_ALLOC()
77-
#define _STR_HEADER_SIZE _ZSTR_HEADER_SIZE
78-
#define STR_ALLOCA_ALLOC(str, _len, use_heap) ZSTR_ALLOCA_ALLOC(str, _len, use_heap)
79-
#define STR_ALLOCA_INIT(str, s, len, use_heap) ZSTR_ALLOCA_INIT(str, s, len, use_heap)
80-
#define STR_ALLOCA_FREE(str, use_heap) ZSTR_ALLOCA_FREE(str, use_heap)
81-
8273
/*---*/
8374

8475
#define ZSTR_IS_INTERNED(s) (GC_FLAGS(s) & IS_STR_INTERNED)

0 commit comments

Comments
 (0)