tree-wide: Replace ZEND_WRONG_PARAM_COUNT() by its definition

This macro was hiding control flow (the return statement) and thus was
particularly unhygienic.

Author: TimWolla

UPGRADING.INTERNALS

@@ -20,8 +20,9 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . The misnamed ZVAL_IS_NULL() has been removed. Use Z_ISNULL() instead.
   . New zend_class_entry.ce_flags2 and zend_function.fn_flags2 fields were
     added, given the primary flags were running out of bits.
-  . The WRONG_PARAM_COUNT macro has been removed. Use
-    ZEND_WRONG_PARAM_COUNT() directly instead.
+  . The WRONG_PARAM_COUNT and ZEND_WRONG_PARAM_COUNT() macros have been
+    removed. Call zend_wrong_param_count(); followed by RETURN_THROWS();
+    instead.
 
 ========================
 2. Build system changes

Zend/zend_API.h

@@ -528,7 +528,6 @@ ZEND_API const char *zend_get_type_by_const(int type);
 #define ZEND_IS_METHOD_CALL()				(EX(func)->common.scope != NULL)
 
 #define ZEND_NUM_ARGS()						EX_NUM_ARGS()
-#define ZEND_WRONG_PARAM_COUNT()					{ zend_wrong_param_count(); return; }
 
 #ifndef ZEND_WIN32
 #define DLEXPORT

ext/gd/gd.c

@@ -3624,7 +3624,8 @@ PHP_FUNCTION(imagefilter)
 	};
 
 	if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > IMAGE_FILTER_MAX_ARGS) {
-		ZEND_WRONG_PARAM_COUNT();
+		zend_wrong_param_count();
+		RETURN_THROWS();
 	} else if (zend_parse_parameters(2, "Ol", &tmp, gd_image_ce, &filtertype) == FAILURE) {
 		RETURN_THROWS();
 	}

ext/ldap/ldap.c

@@ -980,7 +980,8 @@ PHP_FUNCTION(ldap_connect)
 
 #ifdef HAVE_ORALDAP
 	if (ZEND_NUM_ARGS() == 3 || ZEND_NUM_ARGS() == 4) {
-		ZEND_WRONG_PARAM_COUNT();
+		zend_wrong_param_count();
+		RETURN_THROWS();
 	}
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!lssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) {

ext/pgsql/pgsql.c

@@ -2114,7 +2114,8 @@ PHP_FUNCTION(pg_fetch_assoc)
 	/* pg_fetch_assoc() is added from PHP 4.3.0. It should raise error, when
 	   there is 3rd parameter */
 	if (ZEND_NUM_ARGS() > 2) {
-		ZEND_WRONG_PARAM_COUNT();
+		zend_wrong_param_count();
+		RETURN_THROWS();
 	}
 
 	php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, PGSQL_ASSOC, 0);
@@ -2878,7 +2879,8 @@ PHP_FUNCTION(pg_lo_import)
 		CHECK_DEFAULT_LINK(link);
 	}
 	else {
-		ZEND_WRONG_PARAM_COUNT();
+		zend_wrong_param_count();
+		RETURN_THROWS();
 	}
 
 	if (php_check_open_basedir(ZSTR_VAL(file_in))) {

ext/sockets/sockets.c

@@ -1580,7 +1580,8 @@ PHP_FUNCTION(socket_recvfrom)
 
 			if (arg6 == NULL) {
 				zend_string_efree(recv_buf);
-				ZEND_WRONG_PARAM_COUNT();
+				zend_wrong_param_count();
+				RETURN_THROWS();
 			}
 
 			retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin, (socklen_t *)&slen);
@@ -1607,7 +1608,8 @@ PHP_FUNCTION(socket_recvfrom)
 
 			if (arg6 == NULL) {
 				zend_string_efree(recv_buf);
-				ZEND_WRONG_PARAM_COUNT();
+				zend_wrong_param_count();
+				RETURN_THROWS();
 			}
 
 			retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin6, (socklen_t *)&slen);

ext/spl/spl_directory.c

@@ -2583,7 +2583,8 @@ PHP_METHOD(SplFileObject, fscanf)
 	int result = php_sscanf_internal(ZSTR_VAL(intern->u.file.current_line), ZSTR_VAL(format_str), (int)num_varargs, varargs, 0, return_value);
 
 	if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
-		ZEND_WRONG_PARAM_COUNT();
+		zend_wrong_param_count();
+		RETURN_THROWS();
 	}
 }
 /* }}} */

ext/standard/file.c

@@ -961,7 +961,8 @@ PHP_FUNCTION(fscanf)
 	efree(buf);
 
 	if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
-		ZEND_WRONG_PARAM_COUNT();
+		zend_wrong_param_count();
+		RETURN_THROWS();
 	}
 }
 /* }}} */

ext/standard/string.c

@@ -5875,7 +5875,8 @@ PHP_FUNCTION(sscanf)
 	result = php_sscanf_internal(str, format, num_args, args, 0, return_value);
 
 	if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
-		ZEND_WRONG_PARAM_COUNT();
+		zend_wrong_param_count();
+		RETURN_THROWS();
 	}
 }
 /* }}} */