From: Felipe Pena <felipe@php.net>
Date: Thu, 28 Feb 2008 14:16:25 +0000 (+0000)
Subject: New macro for check void parameters
X-Git-Tag: RELEASE_2_0_0a1~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1e8d340c3fe0c889146332fe2e2b70a11980685;p=php

New macro for check void parameters
---

diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 673de377f6..34993eb5ef 100644
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -658,8 +658,8 @@ PHP_FUNCTION(com_create_guid)
 	GUID retval;
 	OLECHAR *guid_string;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	php_com_initialize(TSRMLS_C);
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index d9feaefc2c..743ecefcf1 100644
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -55,8 +55,8 @@ PHP_FUNCTION(curl_multi_init)
 {
 	php_curlm *mh;
 	
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	mh = ecalloc(1, sizeof(php_curlm));
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index b709345863..84aa11a254 100644
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -138,8 +138,7 @@ entry = zend_register_internal_class_ex(&ce, parent_ce, NULL TSRMLS_CC);
 }
 
 #define DOM_NO_ARGS() \
-	if (ZEND_NUM_ARGS() != 0) { \
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expects exactly 0 parameters, %d given", ZEND_NUM_ARGS()); \
+	if (zend_parse_parameters_none() == FAILURE) { \
 		return; \
 	}
 
diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index d201f1b267..698d47eecc 100644
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -528,8 +528,8 @@ PHP_FUNCTION(fdf_create)
 	FDFDoc fdf;
 	FDFErc err;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	err = FDFCreate(&fdf);
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 9fd5854ba7..57d3d2c7c6 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1350,9 +1350,8 @@ PHP_MINFO_FUNCTION(gd)
  */
 PHP_FUNCTION(gd_info)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		ZEND_WRONG_PARAM_COUNT();
-		RETURN_FALSE;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	array_init(return_value);
@@ -2159,8 +2158,8 @@ PHP_FUNCTION(imagetypes)
 	ret |= 16;
 #endif
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	RETURN_LONG(ret);
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 21ced9043a..a6db72647a 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3657,8 +3657,8 @@ PHP_FUNCTION(imap_alerts)
 {
 	STRINGLIST *cur=NIL;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	} 
   
 	if (IMAPG(imap_alertstack) == NIL) {
@@ -3684,8 +3684,8 @@ PHP_FUNCTION(imap_errors)
 {
 	ERRORLIST *cur=NIL;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	} 
   
 	if (IMAPG(imap_errorstack) == NIL) {
@@ -3711,8 +3711,8 @@ PHP_FUNCTION(imap_last_error)
 {
 	ERRORLIST *cur=NIL;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	} 
   
 	if (IMAPG(imap_errorstack) == NIL) {
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 1523f19132..a8a6acd94d 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -203,8 +203,8 @@ int le_link, le_plink, le_trans;
    Return error message */
 PHP_FUNCTION(ibase_errmsg)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	if (IBG(sql_code) != 0) {
@@ -219,8 +219,8 @@ PHP_FUNCTION(ibase_errmsg)
    Return error code */
 PHP_FUNCTION(ibase_errcode)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	if (IBG(sql_code) != 0) {
diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c
index 41b8afb708..24eed65dc1 100644
--- a/ext/mhash/mhash.c
+++ b/ext/mhash/mhash.c
@@ -63,7 +63,7 @@ zend_module_entry mhash_module_entry = {
 ZEND_GET_MODULE(mhash)
 #endif
 
-#define NO_ARGS() (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ""))
+#define NO_ARGS() (SUCCESS == zend_parse_parameters_none())
 
 #ifndef HAVE_MHASH_GET_HASH_NAME_STATIC_PROTO
 extern const char *mhash_get_hash_name_static(hashid hash);
diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index 66d20058a4..cd4c0d5f12 100644
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -443,8 +443,8 @@ static SWFBitmap getBitmap(zval *id TSRMLS_DC)
    Returns the width of this bitmap */
 PHP_METHOD(swfbitmap, getWidth)
 {
-	if(ZEND_NUM_ARGS() != 0) {
-	    WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+	    return;
 	}
 	RETURN_DOUBLE(SWFBitmap_getWidth(getBitmap(getThis() TSRMLS_CC)));
 }
@@ -454,8 +454,8 @@ PHP_METHOD(swfbitmap, getWidth)
    Returns the height of this bitmap */
 PHP_METHOD(swfbitmap, getHeight)
 {
-	if(ZEND_NUM_ARGS() != 0) {
-	    WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+	    return;
 	}
 	RETURN_DOUBLE(SWFBitmap_getHeight(getBitmap(getThis() TSRMLS_CC)));
 }
@@ -1056,9 +1056,9 @@ PHP_METHOD(swfdisplayitem, remove)
 {
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	SWFDisplayItem_remove(item);
 }
 /* }}} */
@@ -1086,9 +1086,9 @@ PHP_METHOD(swfdisplayitem, endMask)
 {
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	SWFDisplayItem_endMask(item);
 }
 /* }}} */
@@ -1100,9 +1100,9 @@ PHP_METHOD(swfdisplayitem, getX)
 	float ret;
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	ret = SWFDisplayItem_get_x(item);
 	RETURN_DOUBLE(ret);
 }
@@ -1115,9 +1115,9 @@ PHP_METHOD(swfdisplayitem, getY)
 	float ret;
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	ret = SWFDisplayItem_get_y(item);
 	RETURN_DOUBLE(ret);
 }
@@ -1130,9 +1130,9 @@ PHP_METHOD(swfdisplayitem, getXScale)
 	float ret;
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	ret = SWFDisplayItem_get_xScale(item);
 	RETURN_DOUBLE(ret);
 }
@@ -1145,9 +1145,9 @@ PHP_METHOD(swfdisplayitem, getYScale)
 	float ret;
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	ret = SWFDisplayItem_get_yScale(item);
 	RETURN_DOUBLE(ret);
 }
@@ -1160,9 +1160,9 @@ PHP_METHOD(swfdisplayitem, getXSkew)
 	float ret;
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	ret = SWFDisplayItem_get_xSkew(item);
 	RETURN_DOUBLE(ret);
 }
@@ -1175,9 +1175,9 @@ PHP_METHOD(swfdisplayitem, getYSkew)
 	float ret;
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	ret = SWFDisplayItem_get_ySkew(item);
 	RETURN_DOUBLE(ret);
 }
@@ -1190,9 +1190,9 @@ PHP_METHOD(swfdisplayitem, getRot)
 	float ret;
 	SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	ret = SWFDisplayItem_get_rot(item);
 	RETURN_DOUBLE(ret);
 }
@@ -1547,8 +1547,8 @@ PHP_METHOD(swffont, getWideWidth)
    Returns the ascent of the font, or 0 if not available */
 PHP_METHOD(swffont, getAscent)
 {
-    if(ZEND_NUM_ARGS() != 0) {
-	    WRONG_PARAM_COUNT;
+    if (zend_parse_parameters_none() == FAILURE) {
+	    return;
 	}
 	RETURN_DOUBLE(SWFFont_getAscent(getFont(getThis() TSRMLS_CC)));
 }
@@ -1558,8 +1558,8 @@ PHP_METHOD(swffont, getAscent)
    Returns the descent of the font, or 0 if not available */
 PHP_METHOD(swffont, getDescent)
 {
-    if(ZEND_NUM_ARGS() != 0) {
-	    WRONG_PARAM_COUNT;
+    if (zend_parse_parameters_none() == FAILURE) {
+	    return;
 	}
 	RETURN_DOUBLE(SWFFont_getDescent(getFont(getThis() TSRMLS_CC)));
 }
@@ -1569,8 +1569,8 @@ PHP_METHOD(swffont, getDescent)
    Returns the leading of the font, or 0 if not available */
 PHP_METHOD(swffont, getLeading)
 {
-    if(ZEND_NUM_ARGS() != 0) {
-	    WRONG_PARAM_COUNT;
+    if (zend_parse_parameters_none() == FAILURE) {
+	    return;
 	}
 	RETURN_DOUBLE(SWFFont_getLeading(getFont(getThis() TSRMLS_CC)));
 }
@@ -1879,9 +1879,9 @@ PHP_METHOD(swfsoundinstance, noMultiple)
 {
 	SWFSoundInstance inst = getSoundInstance(getThis() TSRMLS_CC);
 
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	SWFSoundInstance_setNoMultiple(inst);
 }
 /* }}} */
@@ -2030,9 +2030,9 @@ PHP_METHOD(swfvideostream, setdimension)
 /* {{{ getNumFrames */
 PHP_METHOD(swfvideostream, getnumframes) 
 {
-	if(ZEND_NUM_ARGS() != 0)
-		WRONG_PARAM_COUNT;
-
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
 	RETURN_LONG(SWFVideoStream_getNumFrames(getVideoStream(getThis() TSRMLS_CC)));
 }
 /* }}} */
@@ -3746,8 +3746,8 @@ PHP_METHOD(swftext, getWideWidth)
    Returns the ascent of the current font at its current size, or 0 if not available */
 PHP_METHOD(swftext, getAscent)
 {
-	if(ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 	RETURN_DOUBLE(SWFText_getAscent(getText(getThis() TSRMLS_CC)));
 }
@@ -3757,8 +3757,8 @@ PHP_METHOD(swftext, getAscent)
    Returns the descent of the current font at its current size, or 0 if not available */
 PHP_METHOD(swftext, getDescent)
 {
-	if(ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
   RETURN_DOUBLE(SWFText_getDescent(getText(getThis() TSRMLS_CC)));
 }
@@ -3768,8 +3768,8 @@ PHP_METHOD(swftext, getDescent)
    Returns the leading of the current font at its current size, or 0 if not available */
 PHP_METHOD(swftext, getLeading)
 {
-	if(ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
   RETURN_DOUBLE(SWFText_getLeading(getText(getThis() TSRMLS_CC)));
 }
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index da4c6fd610..ad26fdd972 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1032,8 +1032,8 @@ PHP_FUNCTION(mysql_select_db)
    Returns a string that represents the client library version */
 PHP_FUNCTION(mysql_get_client_info)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	RETURN_UTF8_STRING((char *)mysql_get_client_info(), ZSTR_DUPLICATE);
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index accccc80f5..31f2dcdc90 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -782,8 +782,8 @@ PHP_FUNCTION(odbc_close_all)
 	int i;
 	int nument;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	nument = zend_hash_next_free_element(&EG(regular_list));
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 8027e0d678..b395bd2803 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3686,8 +3686,8 @@ PHP_FUNCTION(openssl_error_string)
 	char buf[512];
 	unsigned long val;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	val = ERR_get_error();
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 9fc3c45edb..6abb2a4efd 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -2023,7 +2023,7 @@ PHPAPI void  php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return
    Returns the error code of the last regexp execution. */
 static PHP_FUNCTION(preg_last_error)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/session/session.c b/ext/session/session.c
index a6bb7357bb..695da00c55 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1402,8 +1402,8 @@ static PHP_FUNCTION(session_set_cookie_params)
    Return the session cookie parameters */ 
 static PHP_FUNCTION(session_get_cookie_params)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	array_init(return_value);
@@ -1690,8 +1690,8 @@ static PHP_FUNCTION(session_encode)
 	int len;
 	char *enc;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	enc = php_session_encode(&len TSRMLS_CC);
@@ -1738,8 +1738,8 @@ static PHP_FUNCTION(session_start)
    Destroy the current session and all data associated with it */
 static PHP_FUNCTION(session_destroy)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	RETURN_BOOL(php_session_destroy(TSRMLS_C) == SUCCESS);
diff --git a/ext/skeleton/create_stubs b/ext/skeleton/create_stubs
index 61957289d0..0a5f28607e 100755
--- a/ext/skeleton/create_stubs
+++ b/ext/skeleton/create_stubs
@@ -197,7 +197,7 @@ END {
 			ints = ints "\tint argc = ZEND_NUM_ARGS();\n"
 			fetchargs = fetchargs "argc TSRMLS_CC, " specs[i]
 		} else {
-			fetchargs = fetchargs "\tif (ZEND_NUM_ARGS() != 0) {\n\t\tWRONG_PARAM_COUNT;\n\t}"
+			fetchargs = fetchargs "\tif (zend_parse_parameters_none() == FAILURE) {\n\t\treturn;\n\t}"
 	 		xmlparams = xmlparams "      <void/>\n"
 		}
 
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 4864ee7b25..0a880ca1e0 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -693,8 +693,8 @@ PHP_FUNCTION(snmprealwalk)
    Return the current status of quick_print */
 PHP_FUNCTION(snmp_get_quick_print)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 #ifdef HAVE_NET_SNMP
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 8f2210b76c..ff01c7d3c0 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -111,8 +111,8 @@ static void soap_error_handler(int error_num, const char *error_filename, const
 #define HTTP_RAW_POST_DATA "HTTP_RAW_POST_DATA"
 
 #define ZERO_PARAM() \
-	if (ZEND_NUM_ARGS() != 0) \
- 		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) \
+ 		return;
 
 static zend_class_entry* soap_client_class_entry;
 static zend_class_entry* soap_server_class_entry;
@@ -1130,8 +1130,8 @@ PHP_METHOD(SoapFault, __toString)
 	zend_fcall_info fci;
 	zval fname;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	faultcode   = zend_read_property(soap_fault_class_entry, this_ptr, "faultcode", sizeof("faultcode")-1, 1 TSRMLS_CC);
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index 15cb759337..03d5411bdf 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -565,7 +565,7 @@ SPL_METHOD(SplDoublyLinkedList, pop)
 	zval *value;
 	spl_dllist_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -588,7 +588,7 @@ SPL_METHOD(SplDoublyLinkedList, shift)
 	zval *value;
 	spl_dllist_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -611,7 +611,7 @@ SPL_METHOD(SplDoublyLinkedList, top)
 	zval *value;
 	spl_dllist_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -634,7 +634,7 @@ SPL_METHOD(SplDoublyLinkedList, bottom)
 	zval *value;
 	spl_dllist_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -656,7 +656,7 @@ SPL_METHOD(SplDoublyLinkedList, count)
 {
 	long count;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -671,7 +671,7 @@ SPL_METHOD(SplDoublyLinkedList, isEmpty)
 {
 	long count;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -711,7 +711,7 @@ SPL_METHOD(SplDoublyLinkedList, getIteratorMode)
 {
 	spl_dllist_object *intern;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 754b8aeefc..4cc0b928af 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -2615,8 +2615,8 @@ PHP_FUNCTION(sqlite_column)
    Returns the version of the linked SQLite library. */
 PHP_FUNCTION(sqlite_libversion)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 	RETURN_ASCII_STRING((char*)sqlite_libversion(), ZSTR_DUPLICATE);
 }
@@ -2626,8 +2626,8 @@ PHP_FUNCTION(sqlite_libversion)
    Returns the encoding (iso8859 or UTF-8) of the linked SQLite library. */
 PHP_FUNCTION(sqlite_libencoding)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 	RETURN_ASCII_STRING((char*)sqlite_libencoding(), ZSTR_DUPLICATE);
 }
@@ -2642,8 +2642,8 @@ PHP_FUNCTION(sqlite_changes)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		DB_FROM_OBJECT(db, object);
 	} else {
@@ -2666,8 +2666,8 @@ PHP_FUNCTION(sqlite_last_insert_rowid)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		DB_FROM_OBJECT(db, object);
 	} else {
@@ -2703,8 +2703,8 @@ PHP_FUNCTION(sqlite_num_rows)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -2732,8 +2732,8 @@ PHP_FUNCTION(sqlite_valid)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -2756,8 +2756,8 @@ PHP_FUNCTION(sqlite_has_prev)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -2785,8 +2785,8 @@ PHP_FUNCTION(sqlite_num_fields)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -2874,8 +2874,8 @@ PHP_FUNCTION(sqlite_rewind)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -2909,8 +2909,8 @@ PHP_FUNCTION(sqlite_next)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -2944,8 +2944,8 @@ PHP_FUNCTION(sqlite_key)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -2968,8 +2968,8 @@ PHP_FUNCTION(sqlite_prev)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		RES_FROM_OBJECT(res, object);
 	} else {
@@ -3036,8 +3036,8 @@ PHP_FUNCTION(sqlite_last_error)
 	zval *object = getThis();
 
 	if (object) {
-		if (ZEND_NUM_ARGS() != 0) {
-			WRONG_PARAM_COUNT
+		if (zend_parse_parameters_none() == FAILURE) {
+			return;
 		}
 		DB_FROM_OBJECT(db, object);
 	} else {
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 07d47841cf..ac61813713 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4828,8 +4828,8 @@ PHP_FUNCTION(time_sleep_until)
    Get the name of the owner of the current PHP script */
 PHP_FUNCTION(get_current_user)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	RETURN_RT_STRING(php_get_current_user(), ZSTR_DUPLICATE);
@@ -5055,7 +5055,7 @@ PHPAPI char *php_get_current_user(void) /* {{{ */
 	Get the last occurred error as associative array. Returns NULL if there hasn't been an error yet. */
 PHP_FUNCTION(error_get_last)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -5804,7 +5804,7 @@ PHP_FUNCTION(get_include_path)
 {
 	char *str;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -5822,7 +5822,7 @@ PHP_FUNCTION(get_include_path)
    Restore the value of the include_path configuration option */
 PHP_FUNCTION(restore_include_path)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 	zend_restore_ini_entry("include_path", sizeof("include_path"), PHP_INI_STAGE_RUNTIME);
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index d834d795f6..bf2c3ca4eb 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -355,8 +355,8 @@ PHP_FUNCTION(getcwd)
 	char path[MAXPATHLEN];
 	char *ret=NULL;
 	
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 #if HAVE_GETCWD
diff --git a/ext/standard/file.c b/ext/standard/file.c
index dfd5988193..26d14ddc74 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -957,8 +957,8 @@ PHP_NAMED_FUNCTION(php_if_tmpfile)
 {
 	php_stream *stream;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	stream = php_stream_fopen_tmpfile();
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 0d4fba17bc..4d2fe4fd78 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -262,8 +262,8 @@ static void php_head_apply_header_list_to_hash(void *data, void *arg TSRMLS_DC)
    Return list of headers to be sent / already sent */
 PHP_FUNCTION(headers_list)
 {
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	if (!&SG(sapi_headers).headers) {
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 40dc92ad72..d711c18ac6 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -1024,7 +1024,7 @@ PHPAPI char *php_logo_guid(void)
    Return the special ID used to request the PHP logo in phpinfo screens*/
 PHP_FUNCTION(php_logo_guid)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1036,7 +1036,7 @@ PHP_FUNCTION(php_logo_guid)
    Return the special ID used to request the PHP logo in phpinfo screens*/
 PHP_FUNCTION(php_real_logo_guid)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1048,7 +1048,7 @@ PHP_FUNCTION(php_real_logo_guid)
    Return the special ID used to request the PHP logo in phpinfo screens*/
 PHP_FUNCTION(php_egg_logo_guid)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1060,7 +1060,7 @@ PHP_FUNCTION(php_egg_logo_guid)
    Return the special ID used to request the Zend logo in phpinfo screens*/
 PHP_FUNCTION(zend_logo_guid)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1072,7 +1072,7 @@ PHP_FUNCTION(zend_logo_guid)
    Return the current SAPI module name */
 PHP_FUNCTION(php_sapi_name)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/standard/rand.c b/ext/standard/rand.c
index 7f28467640..9ff027b5e1 100644
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@ -351,8 +351,8 @@ PHP_FUNCTION(mt_rand)
    Returns the maximum value a random number can have */
 PHP_FUNCTION(getrandmax)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	RETURN_LONG(PHP_RAND_MAX);
@@ -363,8 +363,8 @@ PHP_FUNCTION(getrandmax)
    Returns the maximum value a random number from Mersenne Twister can have */
 PHP_FUNCTION(mt_getrandmax)
 {
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	/*
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 98671a8501..d0dc7353dc 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -566,8 +566,8 @@ PHP_FUNCTION(stream_get_transports)
 	uint stream_xport_len;
 	ulong num_key;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	if ((stream_xport_hash = php_stream_xport_get_hash())) {
@@ -594,8 +594,8 @@ PHP_FUNCTION(stream_get_wrappers)
 	uint key_flags, stream_protocol_len = 0;
 	ulong num_key;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) {
diff --git a/ext/standard/string.c b/ext/standard/string.c
index a85888d33c..03679e74bb 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -7172,7 +7172,7 @@ PHP_FUNCTION(localeconv)
 	int len, i;
 
 	/* We don't need no stinkin' parameters... */
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 090fb4db7e..fd05b509fd 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -205,7 +205,7 @@ static void start_syslog(TSRMLS_D)
    Initializes all syslog-related variables */
 PHP_FUNCTION(define_syslog_variables)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -245,7 +245,7 @@ PHP_FUNCTION(openlog)
    Close connection to system logger */
 PHP_FUNCTION(closelog)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index a0a4e78c42..e5ea2bbe98 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -577,8 +577,8 @@ PHP_FUNCTION(stream_get_filters)
 	HashPosition pos;
 	ulong num_key;
 
-	if (ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	array_init(return_value);
diff --git a/ext/unicode/collator.c b/ext/unicode/collator.c
index 68eb06aa74..2d50aeb206 100644
--- a/ext/unicode/collator.c
+++ b/ext/unicode/collator.c
@@ -332,7 +332,7 @@ PHP_FUNCTION(collator_get_attribute)
    Returns default collator */
 PHP_FUNCTION(collator_get_default)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/unicode/locale.c b/ext/unicode/locale.c
index c91e8c5fdc..9fc7e5f8e2 100644
--- a/ext/unicode/locale.c
+++ b/ext/unicode/locale.c
@@ -42,7 +42,7 @@ static void php_canonicalize_locale_id(char **target, int32_t *target_len, char
    Returns default locale */
 PHP_FUNCTION(locale_get_default)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/unicode/unicode.c b/ext/unicode/unicode.c
index ade1704a9d..34e86a6260 100644
--- a/ext/unicode/unicode.c
+++ b/ext/unicode/unicode.c
@@ -224,7 +224,7 @@ PHP_FUNCTION(unicode_get_error_mode)
    Returns global substitution character for conversion from Unicode to codepage */
 PHP_FUNCTION(unicode_get_subst_char)
 {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/unicode/unicode_iterators.c b/ext/unicode/unicode_iterators.c
index ef663fb03d..a3e66a3f58 100644
--- a/ext/unicode/unicode_iterators.c
+++ b/ext/unicode/unicode_iterators.c
@@ -1043,7 +1043,7 @@ PHP_METHOD(TextIterator, current)
 	zval *object = getThis();
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1087,7 +1087,7 @@ PHP_METHOD(TextIterator, key)
 	zval *object = getThis();
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1102,7 +1102,7 @@ PHP_METHOD(TextIterator, valid)
 	zval *object = getThis();
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1118,7 +1118,7 @@ PHP_METHOD(TextIterator, rewind)
 	zval *object = getThis();
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1140,7 +1140,7 @@ PHP_METHOD(TextIterator, last)
 	zval *object = getThis();
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1162,7 +1162,7 @@ PHP_METHOD(TextIterator, offset)
 	zval *object = getThis();
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1267,7 +1267,7 @@ PHP_METHOD(TextIterator, getAvailableLocales)
 {
 	int32_t count, i;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1286,7 +1286,7 @@ PHP_METHOD(TextIterator, getRuleStatus)
 	zval *object = getThis();
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1308,7 +1308,7 @@ PHP_METHOD(TextIterator, getRuleStatusArray)
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 	UErrorCode status = U_ZERO_ERROR;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
@@ -1344,7 +1344,7 @@ PHP_METHOD(TextIterator, getAll)
 	text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC);
 	text_iter_ops *ops = iter_ops[intern->type];
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 4cc199767a..7974709f7b 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -785,8 +785,8 @@ PHP_FUNCTION(xmlrpc_decode)
    Creates an xmlrpc server */
 PHP_FUNCTION(xmlrpc_server_create)
 {
-	if(ZEND_NUM_ARGS() != 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	if(return_value_used) {
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 7549c6eb70..1b24dd8b1c 100644
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -164,8 +164,8 @@ static void apache_request_read_string_slot(int offset, INTERNAL_FUNCTION_PARAME
 	request_rec *r;
 	char *s;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -224,8 +224,8 @@ static void apache_request_read_int_slot(int offset, INTERNAL_FUNCTION_PARAMETER
 	request_rec *r;
 	long l;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -683,8 +683,8 @@ PHP_FUNCTION(apache_request_server_port)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -766,8 +766,8 @@ PHP_FUNCTION(apache_request_set_etag)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -784,8 +784,8 @@ PHP_FUNCTION(apache_request_set_last_modified)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -802,8 +802,8 @@ PHP_FUNCTION(apache_request_meets_conditions)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -819,8 +819,8 @@ PHP_FUNCTION(apache_request_discard_request_body)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -836,8 +836,8 @@ PHP_FUNCTION(apache_request_satisfies)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -854,8 +854,8 @@ PHP_FUNCTION(apache_request_is_initial_req)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -871,8 +871,8 @@ PHP_FUNCTION(apache_request_some_auth_required)
 	zval *id;
 	request_rec *r;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -889,8 +889,8 @@ PHP_FUNCTION(apache_request_auth_type)
 	request_rec *r;
 	char *t;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);
@@ -911,8 +911,8 @@ PHP_FUNCTION(apache_request_auth_name)
 	request_rec *r;
 	char *t;
 
-	if (ZEND_NUM_ARGS() > 0) {
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
 	}
 
 	APREQ_GET_REQUEST(id, r);