Skip to content

Commit 69abffd

Browse files
committed
Finish deprecation of $row < 0
odbc_fetch_row was changed to have $row be nullable and null by default instead of using 0, but still accepted 0 due to old code being explicit. Remove that special handling. See GH-13910. This should be merged if it passes in the 8.6 deprecations RFC.
1 parent 19eabc6 commit 69abffd

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

ext/odbc/php_odbc.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,11 +1342,8 @@ static void php_odbc_fetch(INTERNAL_FUNCTION_PARAMETERS, bool return_array, php_
13421342
result = Z_ODBC_RESULT_P(pv_res);
13431343
CHECK_ODBC_RESULT(result);
13441344

1345-
/* TODO deprecate $row argument values less than 1 after PHP 8.4
1346-
* for functions other than odbc_fetch_row (see GH-13910)
1347-
*/
1348-
if (!result_type && !pv_row_is_null && pv_row < 1) {
1349-
php_error_docref(NULL, E_WARNING, "Argument #3 ($row) must be greater than or equal to 1");
1345+
if (!pv_row_is_null && pv_row < 1) {
1346+
php_error_docref(NULL, E_WARNING, "Last argument ($row) must be greater than or equal to 1");
13501347
RETURN_FALSE;
13511348
}
13521349

0 commit comments

Comments
 (0)