Skip to content

Commit ec6f6df

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fix PDO_OCI test
2 parents e387e4d + 34aefa3 commit ec6f6df

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

ext/pdo_oci/tests/pdo_oci_stmt_getcolumnmeta.phpt

+10-3
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,15 @@ SQL
5151
}
5252

5353
// invalid offset
54-
$tmp = @$stmt->getColumnMeta(-1);
55-
printf(" 1.3 Expecting false got %s\n", var_export($tmp, true));
54+
echo " 1.3 ";
55+
try {
56+
$tmp = $stmt->getColumnMeta(-1);
57+
} catch (ValueError $e) {
58+
if (false !== $tmp) {
59+
printf("[1.3] Expecting false got %s\n", var_export($tmp, true));
60+
}
61+
echo $e->getMessage(), "\n";
62+
}
5663

5764
// PDOStatement::getColumnMeta(): Argument #1 must be of type int, array given in
5865
echo " 1.4 ";
@@ -311,7 +318,7 @@ Preparations before the test
311318
Test 1. calling function with invalid parameters
312319
1.1 Expecting false got false
313320
1.2 PDOStatement::getColumnMeta() expects exactly 1 argument, 0 given
314-
1.3 Expecting false got false
321+
1.3 PDOStatement::getColumnMeta(): Argument #1 ($column) must be greater than or equal to 0
315322
1.4 PDOStatement::getColumnMeta(): Argument #1 ($column) must be of type int, array given
316323
1.5 PDOStatement::getColumnMeta() expects exactly 1 argument, 2 given
317324
1.6 Expecting false because of invalid offset got false

0 commit comments

Comments
 (0)