Skip to content

Commit 8addc3c

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix some odbc_*() parameter types
2 parents 7b9b832 + 3c70f5e commit 8addc3c

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

ext/odbc/odbc.stub.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,18 +351,15 @@ function odbc_exec(Odbc\Connection $odbc, string $query): Odbc\Result|false {}
351351
function odbc_do(Odbc\Connection $odbc, string $query): Odbc\Result|false {}
352352

353353
#ifdef PHP_ODBC_HAVE_FETCH_HASH
354-
/** @param resource $statement */
355-
function odbc_fetch_object($statement, ?int $row = null): stdClass|false {}
354+
function odbc_fetch_object(Odbc\Result $statement, ?int $row = null): stdClass|false {}
356355

357-
/** @param resource $statement */
358-
function odbc_fetch_array($statement, ?int $row = null): array|false {}
356+
function odbc_fetch_array(Odbc\Result $statement, ?int $row = null): array|false {}
359357
#endif
360358

361359
/**
362-
* @param resource $statement
363360
* @param array $array
364361
*/
365-
function odbc_fetch_into($statement, &$array, ?int $row = null): int|false {}
362+
function odbc_fetch_into(Odbc\Result $statement, &$array, ?int $row = null): int|false {}
366363

367364
function odbc_fetch_row(Odbc\Result $statement, ?int $row = null): bool {}
368365

ext/odbc/odbc_arginfo.h

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)