Skip to content

Commit 608802f

Browse files
committed
ext/pdo: applied fixers to improve test robustness
1 parent c5511d7 commit 608802f

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

ext/pdo/tests/bug_77849_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ try {
99
$stmt = new PDOStatement();
1010
clone $stmt;
1111
} catch (Throwable $e) {
12-
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
12+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1313
}
1414

1515
?>

ext/pdo/tests/pdo_036.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ try {
1717
$x->queryString = "SELECT 2";
1818
var_dump($x);
1919
} catch (Error $e) {
20-
echo $e->getMessage(), "\n";
20+
echo $e::class, ': ', $e->getMessage(), "\n";
2121
}
2222

2323
$instance = new reflectionclass('pdorow');
@@ -34,7 +34,7 @@ object(PDOStatement)#2 (1) {
3434
["queryString"]=>
3535
string(8) "SELECT 1"
3636
}
37-
Property queryString is read only
37+
Error: Property queryString is read only
3838

3939
Fatal error: Uncaught PDOException: You may not create a PDORow manually in %spdo_036.php:%d
4040
Stack trace:

ext/pdo/tests/pdo_uninitialized.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ $pdo = new MyPDO;
1616
try {
1717
$pdo->query("foo");
1818
} catch (Error $e) {
19-
echo $e->getMessage(), "\n";
19+
echo $e::class, ': ', $e->getMessage(), "\n";
2020
}
2121

2222
$stmt = new MyPDOStatement;
2323
try {
2424
$stmt->fetch();
2525
} catch (Error $e) {
26-
echo $e->getMessage(), "\n";
26+
echo $e::class, ': ', $e->getMessage(), "\n";
2727
}
2828
$stmt = new MyPDOStatement;
2929
try {
3030
foreach ($stmt as $row) {}
3131
} catch (Error $e) {
32-
echo $e->getMessage(), "\n";
32+
echo $e::class, ': ', $e->getMessage(), "\n";
3333
}
3434

3535
?>
3636
--EXPECT--
37-
MyPDO object is uninitialized
38-
MyPDOStatement object is uninitialized
39-
MyPDOStatement object is uninitialized
37+
Error: MyPDO object is uninitialized
38+
Error: MyPDOStatement object is uninitialized
39+
Error: MyPDOStatement object is uninitialized

0 commit comments

Comments
 (0)