Skip to content

ext/mysqli: applied fixers to improve test robustness #22929

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

Merged
kamil-tekiela merged 1 commit into from
Jul 30, 2026
Merged

ext/mysqli: applied fixers to improve test robustness #22929

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
8 changes: 4 additions & 4 deletions ext/mysqli/tests/bug36802.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mysqli
try {
$mysql->set_charset('utf8');
} catch (Error $exception) {
echo $exception->getMessage() . "\n";
echo $exception::class, ': ', $exception->getMessage(), "\n";
}
} else {
$x[0] = false;
Expand All @@ -27,7 +27,7 @@ mysqli
try {
$mysql->query("SELECT 'foo' FROM DUAL");
} catch (Error $exception) {
echo $exception->getMessage() . "\n";
echo $exception::class, ': ', $exception->getMessage(), "\n";
}

/* following operations should work */
Expand All @@ -39,8 +39,8 @@ mysqli
var_dump($x);
?>
--EXPECT--
mysqli object is not fully initialized
mysqli object is not fully initialized
Error: mysqli object is not fully initialized
Error: mysqli object is not fully initialized
array(2) {
[1]=>
string(0) ""
Expand Down
6 changes: 3 additions & 3 deletions ext/mysqli/tests/bug62885.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ $tablica = array();
try {
$test1 = mysqli_poll($test2, $test3, $tablica, 0);
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

$test2 = array();
try {
$test1 = mysqli_poll($test2, $test3, $tablica, 0);
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
echo "okey";
?>
--EXPECTF--
No stream arrays were passed
ValueError: No stream arrays were passed

Warning: mysqli_poll(): No stream arrays were passed in %s on line %d
okey
4 changes: 2 additions & 2 deletions ext/mysqli/tests/gh17900.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ $mysqli = new mysqli();
try {
$mysqli->__construct('doesnotexist');
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
Cannot call constructor twice
Error: Cannot call constructor twice
4 changes: 2 additions & 2 deletions ext/mysqli/tests/ghsa-h35g-vwh6-m678-auth-message.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ try {
$info = mysqli_info($conn);
var_dump($info);
} catch (Exception $e) {
echo $e->getMessage() . PHP_EOL;
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

$process->terminate();
Expand All @@ -33,5 +33,5 @@ print "done!";
[*] Sending - Malicious OK Auth Response [Extract heap through buffer over-read]: 0900000200000002000000fcff

Warning: mysqli::__construct(): OK packet message length is past the packet size in %s on line %d
Unknown error while trying to connect via tcp://127.0.0.1:%d
mysqli_sql_exception: Unknown error while trying to connect via tcp://127.0.0.1:%d
done!
8 changes: 4 additions & 4 deletions ext/mysqli/tests/mysqli_driver/write_property.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ try {
/* Read-only property */
$driver->client_info = 'test';
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

$driver->report_mode = "1";
var_dump($driver->report_mode);
try {
$driver->report_mode = [];
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

?>
--EXPECT--
Cannot write read-only property mysqli_driver::$client_info
Error: Cannot write read-only property mysqli_driver::$client_info
int(1)
Cannot assign array to property mysqli_driver::$report_mode of type int
TypeError: Cannot assign array to property mysqli_driver::$report_mode of type int
8 changes: 4 additions & 4 deletions ext/mysqli/tests/mysqli_driver/write_property_strict.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ try {
/* Read-only property */
$driver->client_info = 42;
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

try {
$driver->report_mode = "1";
} catch (Error $e) {
echo $e->getMessage(), "\n";
echo $e::class, ': ', $e->getMessage(), "\n";
}

?>
--EXPECT--
Cannot write read-only property mysqli_driver::$client_info
Cannot assign string to property mysqli_driver::$report_mode of type int
Error: Cannot write read-only property mysqli_driver::$client_info
TypeError: Cannot assign string to property mysqli_driver::$report_mode of type int
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_driver_unclonable.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ try {
$driver = new mysqli_driver;
$driver_clone = clone $driver;
} catch (Throwable $e) {
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

?>
Expand Down
Loading