Skip to content

Commit e1240f2

Browse files
authored
zend_operators: Remove _zval_get_*() PHP 7.2 compatibility macros (#20152)
These have been unused for long enough and just pollute the symbol namespace.
1 parent 2dba2aa commit e1240f2

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

UPGRADING.INTERNALS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ PHP 8.6 INTERNALS UPGRADE NOTES
2222
added, given the primary flags were running out of bits.
2323
. The zval_is_true() alias of zend_is_true() has been removed. Call
2424
zend_is_true() directly instead.
25+
. The _zval_get_*() compatibility macros for PHP 7.2 have been removed
26+
call the variant without the leading underscore instead.
27+
Affected: _zval_get_long, _zval_get_double, _zval_get_string,
28+
_zval_get_long_func, _zval_get_double_func, _zval_get_string_func
2529

2630
========================
2731
2. Build system changes

Zend/zend_operators.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -390,14 +390,6 @@ static zend_always_inline bool try_convert_to_string(zval *op) {
390390
return _try_convert_to_string(op);
391391
}
392392

393-
/* Compatibility macros for 7.2 and below */
394-
#define _zval_get_long(op) zval_get_long(op)
395-
#define _zval_get_double(op) zval_get_double(op)
396-
#define _zval_get_string(op) zval_get_string(op)
397-
#define _zval_get_long_func(op) zval_get_long_func(op)
398-
#define _zval_get_double_func(op) zval_get_double_func(op)
399-
#define _zval_get_string_func(op) zval_get_string_func(op)
400-
401393
#define convert_to_string(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_string((op)); }
402394

403395

0 commit comments

Comments
 (0)