From 4bcd28ec78de1fe69b7f6c10e2708530a9e676d6 Mon Sep 17 00:00:00 2001 From: Rafael Kassner Date: Fri, 28 Nov 2025 14:48:30 +0100 Subject: [PATCH 1/2] PHP 8.4 ext-dba function signatures dba_* functions had their signature changed in PHP 8.4 to return a \Dba\Connection instance. --- resources/functionMap_php84delta.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/functionMap_php84delta.php b/resources/functionMap_php84delta.php index d5552a0840..47b3e2b163 100644 --- a/resources/functionMap_php84delta.php +++ b/resources/functionMap_php84delta.php @@ -20,6 +20,19 @@ 'http_clear_last_response_headers' => ['void'], 'mb_lcfirst' => ['string', 'string'=>'string', 'encoding='=>'string'], 'mb_ucfirst' => ['string', 'string'=>'string', 'encoding='=>'string'], + 'dba_close' => ['void', 'handle'=>'Dba\Connection'], + 'dba_delete' => ['bool', 'key'=>'string', 'handle'=>'Dba\Connection'], + 'dba_exists' => ['bool', 'key'=>'string', 'handle'=>'Dba\Connection'], + 'dba_fetch' => ['string|false', 'key'=>'string', 'skip'=>'int', 'handle'=>'Dba\Connection'], + 'dba_fetch\'1' => ['string|false', 'key'=>'string', 'handle'=>'Dba\Connection'], + 'dba_firstkey' => ['string|false', 'handle'=>'Dba\Connection'], + 'dba_insert' => ['bool', 'key'=>'string', 'value'=>'string', 'handle'=>'Dba\Connection'], + 'dba_nextkey' => ['string|false', 'handle'=>'Dba\Connection'], + 'dba_open' => ['Dba\Connection|false', 'path'=>'string', 'mode'=>'string', 'handlername='=>'string', '...args='=>'string'], + 'dba_optimize' => ['bool', 'handle'=>'Dba\Connection'], + 'dba_popen' => ['Dba\Connection|false', 'path'=>'string', 'mode'=>'string', 'handlername='=>'string', '...args='=>'string'], + 'dba_replace' => ['bool', 'key'=>'string', 'value'=>'string', 'handle'=>'Dba\Connection'], + 'dba_sync' => ['bool', 'handle'=>'Dba\Connection'], ], 'old' => [ From 994155a09b47c1f3a92e738acb3f050d7a55439e Mon Sep 17 00:00:00 2001 From: Rafael Kassner Date: Thu, 11 Dec 2025 17:19:36 +0000 Subject: [PATCH 2/2] Code review changes --- resources/functionMap_php83delta.php | 2 +- resources/functionMap_php84delta.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/functionMap_php83delta.php b/resources/functionMap_php83delta.php index c32bee4c44..195115be0e 100644 --- a/resources/functionMap_php83delta.php +++ b/resources/functionMap_php83delta.php @@ -28,6 +28,6 @@ 'gc_status' => ['array{running:bool,protected:bool,full:bool,runs:int,collected:int,threshold:int,buffer_size:int,roots:int,application_time:float,collector_time:float,destructor_time:float,free_time:float}'], ], 'old' => [ - + 'dba_fetch\'1' => ['string|false', 'key'=>'string', 'handle'=>'resource'], ] ]; diff --git a/resources/functionMap_php84delta.php b/resources/functionMap_php84delta.php index 47b3e2b163..8048445642 100644 --- a/resources/functionMap_php84delta.php +++ b/resources/functionMap_php84delta.php @@ -24,7 +24,6 @@ 'dba_delete' => ['bool', 'key'=>'string', 'handle'=>'Dba\Connection'], 'dba_exists' => ['bool', 'key'=>'string', 'handle'=>'Dba\Connection'], 'dba_fetch' => ['string|false', 'key'=>'string', 'skip'=>'int', 'handle'=>'Dba\Connection'], - 'dba_fetch\'1' => ['string|false', 'key'=>'string', 'handle'=>'Dba\Connection'], 'dba_firstkey' => ['string|false', 'handle'=>'Dba\Connection'], 'dba_insert' => ['bool', 'key'=>'string', 'value'=>'string', 'handle'=>'Dba\Connection'], 'dba_nextkey' => ['string|false', 'handle'=>'Dba\Connection'],