Make the $enable parameter of odbc_autocommit() nullable (#11909)

Co-authored-by: George Peter Banyard <girgias@php.net>

Author: kocsismate

UPGRADING

@@ -278,6 +278,11 @@ PHP 8.3 UPGRADE NOTES
   . mysqli_poll now raises a ValueError when the read nor error arguments are
     passed.
 
+- ODBC
+  . odbc_autocommit() now accepts null for the $enable parameter.
+    Passing null has the same behaviour as passing only 1 parameter,
+    namely indicating if the autocommit feature is enabled or not.
+
 - PGSQL:
   . pg_fetch_object now raises a ValueError instead of an Exception when the
     constructor_args argument is non empty with the class not having

ext/odbc/odbc.stub.php

@@ -425,7 +425,7 @@ function odbc_field_scale($statement, int $field): int|false {}
 function odbc_field_num($statement, string $field): int|false {}
 
 /** @param resource $odbc */
-function odbc_autocommit($odbc, bool $enable = false): int|bool {}
+function odbc_autocommit($odbc, ?bool $enable = null): int|bool {}
 
 /** @param resource $odbc */
 function odbc_commit($odbc): bool {}

ext/odbc/odbc_arginfo.h

@@ -2553,22 +2553,23 @@ PHP_FUNCTION(odbc_autocommit)
 	RETCODE rc;
 	zval *pv_conn;
 	bool pv_onoff = 0;
+	bool pv_onoff_is_null = true;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|b", &pv_conn, &pv_onoff) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|b!", &pv_conn, &pv_onoff, &pv_onoff_is_null) == FAILURE) {
 		RETURN_THROWS();
 	}
 
 	if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) {
 		RETURN_THROWS();
 	}
 
-	if (ZEND_NUM_ARGS() > 1) {
+	if (!pv_onoff_is_null) {
 		rc = SQLSetConnectOption(conn->hdbc, SQL_AUTOCOMMIT, pv_onoff ? SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF);
 		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
 			odbc_sql_error(conn, SQL_NULL_HSTMT, "Set autocommit");
 			RETURN_FALSE;
 		}
-		RETVAL_TRUE;
+		RETURN_TRUE;
 	} else {
 		SQLINTEGER status;
 
@@ -2577,7 +2578,7 @@ PHP_FUNCTION(odbc_autocommit)
 			odbc_sql_error(conn, SQL_NULL_HSTMT, "Get commit status");
 			RETURN_FALSE;
 		}
-		RETVAL_LONG((zend_long)status);
+		RETURN_LONG((zend_long)status);
 	}
 }
 /* }}} */

ext/odbc/php_odbc.c

@@ -0,0 +1,25 @@
+--TEST--
+odbc_autocommit(): Basic test
+--EXTENSIONS--
+odbc
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+var_dump(odbc_autocommit($conn, true));
+var_dump(odbc_autocommit($conn, null));
+
+var_dump(odbc_autocommit($conn, false));
+var_dump(odbc_autocommit($conn));
+
+?>
+--EXPECTF--
+bool(true)
+int(1)
+bool(true)
+int(0)