Skip to content

Commit 85cf4a3

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix PDO_Firebird tests for 32bit
2 parents f8796aa + 626dc50 commit 85cf4a3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/pdo_firebird/tests/bug_15604.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ $dbh = getDbConnection();
6464
@$dbh->exec('drop sequence g_bug_15604');
6565
unset($dbh);
6666
?>
67-
--EXPECT--
67+
--EXPECTF--
6868
bool(false)
6969
array(3) {
7070
["ID"]=>
71-
int(2)
71+
%r(int\(2\)|string\(1\) "2")%r
7272
["A"]=>
7373
int(2)
7474
["B"]=>

ext/pdo_firebird/tests/fb4_datatypes.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ echo "\ndone\n";
4949
?>
5050
--EXPECTF--
5151
{
52-
"I64": 15,
52+
"I64": %r(15|"15")%r,
5353
"I128": "15",
5454
"N": "123.97",
5555
"N2": "123.97",

0 commit comments

Comments
 (0)