From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 14 Aug 2020 09:15:36 +0000 (+0200)
Subject: Use normal zpp in mysqli_result::__construct()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=179bc21f5f044a884526a2dd3bdcdd98a816f3e6;p=php

Use normal zpp in mysqli_result::__construct()

This method doesn't need any special handling...
---

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index dd39349d14..b2f85bc147 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1021,19 +1021,8 @@ PHP_METHOD(mysqli_result, __construct)
 	MYSQLI_RESOURCE		*mysqli_resource;
 	zend_long				resmode = MYSQLI_STORE_RESULT;
 
-	switch (ZEND_NUM_ARGS()) {
-		case 1:
-			if (zend_parse_parameters(1, "O", &mysql_link, mysqli_link_class_entry)==FAILURE) {
-				RETURN_THROWS();
-			}
-			break;
-		case 2:
-			if (zend_parse_parameters(2, "Ol", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) {
-				RETURN_THROWS();
-			}
-			break;
-		default:
-			WRONG_PARAM_COUNT;
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l", &mysql_link, mysqli_link_class_entry, &resmode) == FAILURE) {
+		RETURN_THROWS();
 	}
 
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);