Skip to content

ext/pdo: applied fixers to improve test robustness #23023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickSdot wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

ext/pdo: applied fixers to improve test robustness #23023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/pdo/tests/bug_77849_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ try {
$stmt = new PDOStatement();
clone $stmt;
} catch (Throwable $e) {
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

?>
Expand Down
4 changes: 2 additions & 2 deletions ext/pdo/tests/pdo_036.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ try {
$x->queryString = "SELECT 2";
var_dump($x);
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

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

Fatal error: Uncaught PDOException: You may not create a PDORow manually in %spdo_036.php:%d
Stack trace:
Expand Down
12 changes: 6 additions & 6 deletions ext/pdo/tests/pdo_uninitialized.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ $pdo = new MyPDO;
try {
$pdo->query("foo");
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

$stmt = new MyPDOStatement;
try {
$stmt->fetch();
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
$stmt = new MyPDOStatement;
try {
foreach ($stmt as $row) {}
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

?>
--EXPECT--
MyPDO object is uninitialized
MyPDOStatement object is uninitialized
MyPDOStatement object is uninitialized
Error: MyPDO object is uninitialized
Error: MyPDOStatement object is uninitialized
Error: MyPDOStatement object is uninitialized
Loading