Remove old ARG_COUNT() macro

Use ZEND_NUM_ARGS() instead.

Clsoes GH-5551

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 599a024a4e074b7303f0fe5eb696927e66a0cdb9..def57d94b957247954d5f8e39c62238d7220a94e 100644 (file)
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -16,6 +16,7 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   m. All internal functions must have arginfo
   n. zend_hash_sort compare function signature change
   o. cast_object() object handler is now required
+  p. ARG_COUNT() macro removed
 
 2. Build system changes
   a. Abstract
@@ -114,6 +115,8 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   o. The cast_object() handler is now required, i.e. must be non-null. You can
      indicate that casting is not supported by always returning FAILURE.
 
+  p. The ARG_COUNT() macro has been removed use ZEND_NUM_ARGS() instead.
+
 ========================
 2. Build system changes
 ========================

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index f97f54af44a409aabf09e76b5e8ac919b6615127..234aa9e99d67019c797ad4513bcb953cad8ec83f 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -408,7 +408,6 @@ ZEND_API const char *zend_get_type_by_const(int type);
 
 #define WRONG_PARAM_COUNT                                      ZEND_WRONG_PARAM_COUNT()
 #define WRONG_PARAM_COUNT_WITH_RETVAL(ret)     ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)
-#define ARG_COUNT(dummy)                                       EX_NUM_ARGS()
 #define ZEND_NUM_ARGS()                                                EX_NUM_ARGS()
 #define ZEND_WRONG_PARAM_COUNT()                                       { zend_wrong_param_count(); return; }
 #define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)                { zend_wrong_param_count(); return ret; }