Merge branch 'PHP-8.4'

* PHP-8.4: Fix some odbc_*() parameter types
SakiTakamachi · Nov 27, 2024 · 8addc3c · 8addc3c
2 parents 7b9b832 + 3c70f5e
commit 8addc3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php
@@ -351,18 +351,15 @@ function odbc_exec(Odbc\Connection $odbc, string $query): Odbc\Result|false {}
     function odbc_do(Odbc\Connection $odbc, string $query): Odbc\Result|false {}
 
 #ifdef PHP_ODBC_HAVE_FETCH_HASH
-    /** @param resource $statement */
-    function odbc_fetch_object($statement, ?int $row = null): stdClass|false {}
+    function odbc_fetch_object(Odbc\Result $statement, ?int $row = null): stdClass|false {}
 
-    /** @param resource $statement */
-    function odbc_fetch_array($statement, ?int $row = null): array|false {}
+    function odbc_fetch_array(Odbc\Result $statement, ?int $row = null): array|false {}
 #endif
 
     /**
-     * @param resource $statement
      * @param array $array
      */
-    function odbc_fetch_into($statement, &$array, ?int $row = null): int|false {}
+    function odbc_fetch_into(Odbc\Result $statement, &$array, ?int $row = null): int|false {}
 
     function odbc_fetch_row(Odbc\Result $statement, ?int $row = null): bool {}
 

diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h