Fix GH-17158: pg_fetch_result Shows Incorrect ArgumentCountError Message when Called With 1 Argument

Author: ndossche

.github/actions/test-linux/action.yml

@@ -50,4 +50,4 @@ runs:
           --offline \
           --show-diff \
           --show-slow 1000 \
-          --set-timeout 120
+          --set-timeout 120 ext/pgsql

ext/pgsql/pgsql.c

@@ -1705,22 +1705,17 @@ PHP_FUNCTION(pg_fetch_result)
 	pgsql_result_handle *pg_result;
 	int pgsql_row;
 
-	if (ZEND_NUM_ARGS() == 2) {
-		ZEND_PARSE_PARAMETERS_START(2, 2)
-			Z_PARAM_OBJECT_OF_CLASS(result, pgsql_result_ce)
-			Z_PARAM_STR_OR_LONG(field_name, field_offset)
-		ZEND_PARSE_PARAMETERS_END();
-	} else {
-		ZEND_PARSE_PARAMETERS_START(3, 3)
-			Z_PARAM_OBJECT_OF_CLASS(result, pgsql_result_ce)
+	ZEND_PARSE_PARAMETERS_START(2, 3)
+		Z_PARAM_OBJECT_OF_CLASS(result, pgsql_result_ce)
+		if (ZEND_NUM_ARGS() == 2) {
 			if (zend_string_equals_literal(EG(current_execute_data)->func->common.function_name, "pg_result")) {
 				Z_PARAM_LONG(row)
 			} else {
 				Z_PARAM_LONG_OR_NULL(row, row_is_null)
 			}
-			Z_PARAM_STR_OR_LONG(field_name, field_offset)
-		ZEND_PARSE_PARAMETERS_END();
-	}
+		}
+		Z_PARAM_STR_OR_LONG(field_name, field_offset)
+	ZEND_PARSE_PARAMETERS_END();
 
 	pg_result = Z_PGSQL_RESULT_P(result);
 	CHECK_PGSQL_RESULT(pg_result);

ext/pgsql/tests/gh17158.phpt

@@ -0,0 +1,26 @@
+--TEST--
+GH-17158 (pg_fetch_result Shows Incorrect ArgumentCountError Message when Called With 1 Argument)
+--EXTENSIONS--
+pgsql
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+
+include('config.inc');
+
+$db = pg_connect($conn_str);
+
+$result = pg_query($db, "SELECT * FROM ".$table_name.";");
+try {
+    pg_fetch_result($result);
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+pg_free_result($result);
+pg_close($db);
+
+?>
+--EXPECT--
+pg_fetch_result() expects 2 or 3 arguments, 1 given