', $matches, 0, PHP_INT_MIN);
} catch (\ValueError $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
preg_match_all( '/<(\w+)[\s\w\-]+ id="S44_i89ew">/', '
', $matches, 0, PHP_INT_MIN);
} catch (\ValueError $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECTF--
-preg_match(): Argument #5 ($offset) must be greater than %s
-preg_match_all(): Argument #5 ($offset) must be greater than %s
+ValueError: preg_match(): Argument #5 ($offset) must be greater than %s
+ValueError: preg_match_all(): Argument #5 ($offset) must be greater than %s
diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt
index ae80ecc3506f..0c1a4733ca90 100644
--- a/ext/pcre/tests/preg_grep_error1.phpt
+++ b/ext/pcre/tests/preg_grep_error1.phpt
@@ -25,18 +25,17 @@ foreach ($values as $value) {
try {
var_dump(preg_grep($value, $array));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
}
$value = new stdclass(); //Object
try {
var_dump(preg_grep($value, $array));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECTF--
-
Warning: preg_grep(): Delimiter must not be alphanumeric, backslash, or NUL byte in %spreg_grep_error1.php on line %d
bool(false)
@@ -48,11 +47,11 @@ bool(false)
Warning: preg_grep(): Unknown modifier 'F' in %spreg_grep_error1.php on line %d
bool(false)
-preg_grep(): Argument #1 ($pattern) must be of type string, array given
+TypeError: preg_grep(): Argument #1 ($pattern) must be of type string, array given
array(2) {
[1]=>
string(3) "abc"
[2]=>
string(4) "test"
}
-preg_grep(): Argument #1 ($pattern) must be of type string, stdClass given
+TypeError: preg_grep(): Argument #1 ($pattern) must be of type string, stdClass given
diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt
index 92d1a6aff664..4965cc1913bb 100644
--- a/ext/pcre/tests/preg_match_all_error1.phpt
+++ b/ext/pcre/tests/preg_match_all_error1.phpt
@@ -25,7 +25,7 @@ foreach ($regex_array as $regex_value) {
try {
var_dump(preg_match_all($regex_value, $subject, $matches1));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
var_dump($matches1);
}
@@ -33,12 +33,11 @@ $regex_value = new stdclass(); //Object
try {
var_dump(preg_match_all($regex_value, $subject, $matches));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
var_dump($matches);
?>
--EXPECTF--
-
Warning: preg_match_all(): Delimiter must not be alphanumeric, backslash, or NUL byte in %spreg_match_all_error1.php on line %d
bool(false)
NULL
@@ -54,7 +53,7 @@ NULL
Warning: preg_match_all(): Unknown modifier 'F' in %spreg_match_all_error1.php on line %d
bool(false)
NULL
-preg_match_all(): Argument #1 ($pattern) must be of type string, array given
+TypeError: preg_match_all(): Argument #1 ($pattern) must be of type string, array given
NULL
int(4)
array(1) {
@@ -70,5 +69,5 @@ array(1) {
string(1) "t"
}
}
-preg_match_all(): Argument #1 ($pattern) must be of type string, stdClass given
+TypeError: preg_match_all(): Argument #1 ($pattern) must be of type string, stdClass given
NULL
diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt
index 870cc498792c..6507f9e47dd6 100644
--- a/ext/pcre/tests/preg_match_error1.phpt
+++ b/ext/pcre/tests/preg_match_error1.phpt
@@ -23,19 +23,18 @@ foreach ($regex_array as $regex_value) {
try {
var_dump(preg_match($regex_value, $subject));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
}
$regex_value = new stdclass(); //Object
try {
var_dump(preg_match($regex_value, $subject));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECTF--
-
Warning: preg_match(): Delimiter must not be alphanumeric, backslash, or NUL byte in %spreg_match_error1.php on line %d
bool(false)
@@ -47,6 +46,6 @@ bool(false)
Warning: preg_match(): Unknown modifier 'F' in %spreg_match_error1.php on line %d
bool(false)
-preg_match(): Argument #1 ($pattern) must be of type string, array given
+TypeError: preg_match(): Argument #1 ($pattern) must be of type string, array given
int(1)
-preg_match(): Argument #1 ($pattern) must be of type string, stdClass given
+TypeError: preg_match(): Argument #1 ($pattern) must be of type string, stdClass given
diff --git a/ext/pcre/tests/preg_replace_callback_array2.phpt b/ext/pcre/tests/preg_replace_callback_array2.phpt
index aca11dc19c6f..ffdcdea71db5 100644
--- a/ext/pcre/tests/preg_replace_callback_array2.phpt
+++ b/ext/pcre/tests/preg_replace_callback_array2.phpt
@@ -9,7 +9,7 @@ $b = "";
try {
var_dump(preg_replace_callback_array(array("xx" => "s"), $a, -1, $b));
} catch (\TypeError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
@@ -24,16 +24,16 @@ var_dump(preg_replace_callback_array(array('/\w' => 'f'), 'z'));
try {
var_dump(preg_replace_callback_array(array('/\w/' => 'f', '/.*/' => 'f'), 'z'));
} catch (Exception $e) {
- var_dump($e->getMessage());
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
echo "Done\n";
?>
--EXPECTF--
-preg_replace_callback_array(): Argument #1 ($pattern) must contain only valid callbacks
+TypeError: preg_replace_callback_array(): Argument #1 ($pattern) must contain only valid callbacks
string(0) ""
Warning: preg_replace_callback_array(): No ending delimiter '/' found in %spreg_replace_callback_array2.php on line %d
NULL
-string(1) "1"
+Exception: 1
Done
diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt
index 0a8a79751a9a..5219496a5535 100644
--- a/ext/pcre/tests/preg_replace_error1.phpt
+++ b/ext/pcre/tests/preg_replace_error1.phpt
@@ -29,11 +29,10 @@ $regex_value = new stdclass(); //Object
try {
var_dump(preg_replace($regex_value, $replace, $subject));
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECTF--
-
Warning: preg_replace(): Delimiter must not be alphanumeric, backslash, or NUL byte in %spreg_replace_error1.php on line %d
NULL
@@ -47,4 +46,4 @@ Warning: preg_replace(): Unknown modifier 'F' in %spreg_replace_error1.php on li
NULL
string(1) "a"
string(1) "1"
-preg_replace(): Argument #1 ($pattern) must be of type array|string, stdClass given
+TypeError: preg_replace(): Argument #1 ($pattern) must be of type array|string, stdClass given
diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt
index 9bc36f655f48..6b4a1bfae934 100644
--- a/ext/pcre/tests/preg_replace_error2.phpt
+++ b/ext/pcre/tests/preg_replace_error2.phpt
@@ -15,17 +15,17 @@ foreach($replace as $value) {
try {
var_dump(preg_replace($regex, $value, $subject));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
}
$value = new stdclass(); //Object
try {
var_dump(preg_replace($regex, $value, $subject));
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
string(64) "this is a stringthis is a stringthis is a stringthis is a string"
-preg_replace(): Argument #1 ($pattern) must be of type array when argument #2 ($replacement) is an array, string given
-preg_replace(): Argument #2 ($replacement) must be of type array|string, stdClass given
+TypeError: preg_replace(): Argument #1 ($pattern) must be of type array when argument #2 ($replacement) is an array, string given
+TypeError: preg_replace(): Argument #2 ($replacement) must be of type array|string, stdClass given
diff --git a/ext/pcre/tests/preg_split_error1.phpt b/ext/pcre/tests/preg_split_error1.phpt
index 6555f21366ad..9e9fd8c7133d 100644
--- a/ext/pcre/tests/preg_split_error1.phpt
+++ b/ext/pcre/tests/preg_split_error1.phpt
@@ -25,18 +25,17 @@ foreach ($regex_array as $regex_value) {
try {
var_dump(preg_split($regex_value, $subject));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
}
$regex_value = new stdclass(); //Object
try {
var_dump(preg_split($regex_value, $subject));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECTF--
-
Warning: preg_split(): Delimiter must not be alphanumeric, backslash, or NUL byte in %spreg_split_error1.php on line %d
bool(false)
@@ -48,7 +47,7 @@ bool(false)
Warning: preg_split(): Unknown modifier 'F' in %spreg_split_error1.php on line %d
bool(false)
-preg_split(): Argument #1 ($pattern) must be of type string, array given
+TypeError: preg_split(): Argument #1 ($pattern) must be of type string, array given
array(3) {
[0]=>
string(4) "1 2 "
@@ -57,4 +56,4 @@ array(3) {
[2]=>
string(4) " 5 6"
}
-preg_split(): Argument #1 ($pattern) must be of type string, stdClass given
+TypeError: preg_split(): Argument #1 ($pattern) must be of type string, stdClass given
diff --git a/ext/posix/tests/posix_access_flags.phpt b/ext/posix/tests/posix_access_flags.phpt
index 0989e2a2bc66..ba2104e6dc1f 100644
--- a/ext/posix/tests/posix_access_flags.phpt
+++ b/ext/posix/tests/posix_access_flags.phpt
@@ -18,19 +18,19 @@ file_put_contents($testfile, "hello");
try {
posix_access($testfile, -1);
} catch (ValueError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
posix_access($testfile, 01000); // S_ISVTX bit (sticky)
} catch (ValueError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
posix_access($testfile, 02000); // S_ISGID bit
} catch (ValueError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
if (posix_access($testfile, POSIX_R_OK | POSIX_W_OK)) {
@@ -47,8 +47,8 @@ if (posix_access($testfile, POSIX_F_OK)) {
@unlink(__DIR__ . '/testfile.txt');
?>
--EXPECTF--
-posix_access(): Argument #2 ($flags) must be a bitmask of POSIX_F_OK, POSIX_R_OK, POSIX_W_OK, and POSIX_X_OK
-posix_access(): Argument #2 ($flags) must be a bitmask of POSIX_F_OK, POSIX_R_OK, POSIX_W_OK, and POSIX_X_OK
-posix_access(): Argument #2 ($flags) must be a bitmask of POSIX_F_OK, POSIX_R_OK, POSIX_W_OK, and POSIX_X_OK
+ValueError: posix_access(): Argument #2 ($flags) must be a bitmask of POSIX_F_OK, POSIX_R_OK, POSIX_W_OK, and POSIX_X_OK
+ValueError: posix_access(): Argument #2 ($flags) must be a bitmask of POSIX_F_OK, POSIX_R_OK, POSIX_W_OK, and POSIX_X_OK
+ValueError: posix_access(): Argument #2 ($flags) must be a bitmask of POSIX_F_OK, POSIX_R_OK, POSIX_W_OK, and POSIX_X_OK
Read/write access OK
File exists OK
diff --git a/ext/posix/tests/posix_eaccess.phpt b/ext/posix/tests/posix_eaccess.phpt
index 4211e6ef13e7..22c1577e4938 100644
--- a/ext/posix/tests/posix_eaccess.phpt
+++ b/ext/posix/tests/posix_eaccess.phpt
@@ -12,9 +12,9 @@ if (!function_exists("posix_eaccess")) die("skip only platforms with posix_eacce
try {
posix_eaccess(str_repeat('bogus path', 1042));
} catch (ValueError $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-posix_eaccess(): Argument #1 ($filename) must not be empty
+ValueError: posix_eaccess(): Argument #1 ($filename) must not be empty
diff --git a/ext/posix/tests/posix_fpathconf.phpt b/ext/posix/tests/posix_fpathconf.phpt
index 91918d5901bb..f0cb749228a3 100644
--- a/ext/posix/tests/posix_fpathconf.phpt
+++ b/ext/posix/tests/posix_fpathconf.phpt
@@ -14,17 +14,16 @@ var_dump(posix_strerror(posix_errno()));
try {
posix_fpathconf("string arg", POSIX_PC_PATH_MAX);
} catch (\TypeError $e) {
- echo $e->getMessage() . "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
$fd = fopen(__DIR__, "r");
var_dump(posix_fpathconf($fd, POSIX_PC_PATH_MAX));
fclose($fd);
?>
--EXPECTF--
-
Warning: posix_fpathconf(): Argument #1 ($file_descriptor) must be between 0 and %d in %s on line %d
bool(false)
bool(true)
string(%d) "Bad file %r(descriptor|number)%r"
-posix_fpathconf(): Argument #1 ($file_descriptor) must be of type int|resource, string given
+TypeError: posix_fpathconf(): Argument #1 ($file_descriptor) must be of type int|resource, string given
int(%d)
diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt
index 68f168554997..39a1d146e481 100644
--- a/ext/posix/tests/posix_getsid_error.phpt
+++ b/ext/posix/tests/posix_getsid_error.phpt
@@ -12,8 +12,8 @@ posix
try {
posix_getsid(-1);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECTF--
-posix_getsid(): Argument #1 ($process_id) must be between 0 and %d
+ValueError: posix_getsid(): Argument #1 ($process_id) must be between 0 and %d
diff --git a/ext/posix/tests/posix_kill_pidoverflow.phpt b/ext/posix/tests/posix_kill_pidoverflow.phpt
index 0e8b8c7b7df1..9d70ef413d91 100644
--- a/ext/posix/tests/posix_kill_pidoverflow.phpt
+++ b/ext/posix/tests/posix_kill_pidoverflow.phpt
@@ -11,15 +11,15 @@ pcntl
try {
posix_kill(PHP_INT_MAX, SIGTERM);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
posix_kill(PHP_INT_MIN, SIGTERM);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECTF--
-posix_kill(): Argument #1 ($process_id) must be between %i and %d
-posix_kill(): Argument #1 ($process_id) must be between %i and %d
+ValueError: posix_kill(): Argument #1 ($process_id) must be between %i and %d
+ValueError: posix_kill(): Argument #1 ($process_id) must be between %i and %d
diff --git a/ext/posix/tests/posix_pathconf.phpt b/ext/posix/tests/posix_pathconf.phpt
index ba451c62df97..2cb92894bdc0 100644
--- a/ext/posix/tests/posix_pathconf.phpt
+++ b/ext/posix/tests/posix_pathconf.phpt
@@ -11,14 +11,14 @@ if (!function_exists("posix_pathconf")) die("skip only platforms with posix_path
try {
posix_pathconf('', POSIX_PC_PATH_MAX);
} catch (\ValueError $e) {
- echo $e->getMessage(). "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
var_dump(posix_pathconf(str_repeat('non_existent', 4096), POSIX_PC_NAME_MAX));
var_dump(posix_errno() != 0);
var_dump(posix_pathconf(sys_get_temp_dir(), POSIX_PC_PATH_MAX));
?>
--EXPECTF--
-posix_pathconf(): Argument #1 ($path) must not be empty
+ValueError: posix_pathconf(): Argument #1 ($path) must not be empty
bool(false)
bool(true)
int(%d)
diff --git a/ext/posix/tests/posix_setpgid_error.phpt b/ext/posix/tests/posix_setpgid_error.phpt
index 0d00dd87c60f..f1d2dc334c52 100644
--- a/ext/posix/tests/posix_setpgid_error.phpt
+++ b/ext/posix/tests/posix_setpgid_error.phpt
@@ -9,26 +9,26 @@ posix
try {
posix_setpgid(PHP_INT_MAX, 1);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
posix_setpgid(-2, 1);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
posix_setpgid(1, PHP_INT_MAX);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
posix_setpgid(1, -2);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECTF--
-posix_setpgid(): Argument #1 ($process_id) must be between 0 and %d
-posix_setpgid(): Argument #1 ($process_id) must be between 0 and %d
-posix_setpgid(): Argument #2 ($process_group_id) must be between 0 and %d
-posix_setpgid(): Argument #2 ($process_group_id) must be between 0 and %d
+ValueError: posix_setpgid(): Argument #1 ($process_id) must be between 0 and %d
+ValueError: posix_setpgid(): Argument #1 ($process_id) must be between 0 and %d
+ValueError: posix_setpgid(): Argument #2 ($process_group_id) must be between 0 and %d
+ValueError: posix_setpgid(): Argument #2 ($process_group_id) must be between 0 and %d
diff --git a/ext/posix/tests/posix_setrlimit.phpt b/ext/posix/tests/posix_setrlimit.phpt
index 51638793f9d4..ea81a944e431 100644
--- a/ext/posix/tests/posix_setrlimit.phpt
+++ b/ext/posix/tests/posix_setrlimit.phpt
@@ -15,22 +15,22 @@ var_dump(posix_setrlimit(POSIX_RLIMIT_NOFILE, 128, 128));
try {
posix_setrlimit(POSIX_RLIMIT_NOFILE, 129, 128);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
posix_setrlimit(POSIX_RLIMIT_NOFILE, -2, -1);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
posix_setrlimit(POSIX_RLIMIT_NOFILE, -1, -2);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
bool(true)
-posix_setrlimit(): Argument #2 ($soft_limit) must be lower or equal to 128
-posix_setrlimit(): Argument #2 ($soft_limit) must be greater or equal to -1
-posix_setrlimit(): Argument #3 ($hard_limit) must be greater or equal to -1
+ValueError: posix_setrlimit(): Argument #2 ($soft_limit) must be lower or equal to 128
+ValueError: posix_setrlimit(): Argument #2 ($soft_limit) must be greater or equal to -1
+ValueError: posix_setrlimit(): Argument #3 ($hard_limit) must be greater or equal to -1
diff --git a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
index e35cd637a7fc..c00d02143e93 100644
--- a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
+++ b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
@@ -22,9 +22,9 @@ $process = proc_open('echo "foo";', $descriptors, $pipes);
try {
var_dump(posix_ttyname($process)); // wrong resource type
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
bool(false)
-posix_ttyname(): supplied resource is not a valid stream resource
+TypeError: posix_ttyname(): supplied resource is not a valid stream resource
diff --git a/ext/readline/tests/readline_callback_handler_install_001.phpt b/ext/readline/tests/readline_callback_handler_install_001.phpt
index 543a57e657ef..d6602403ae05 100644
--- a/ext/readline/tests/readline_callback_handler_install_001.phpt
+++ b/ext/readline/tests/readline_callback_handler_install_001.phpt
@@ -17,10 +17,10 @@ var_dump(readline_callback_handler_install('testing: ', 'foo'));
try {
var_dump(readline_callback_handler_install('testing: ', 'foobar!'));
} catch (\TypeError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
testing: bool(true)
-readline_callback_handler_install(): Argument #2 ($callback) must be a valid callback, function "foobar!" not found or invalid function name
+TypeError: readline_callback_handler_install(): Argument #2 ($callback) must be a valid callback, function "foobar!" not found or invalid function name
diff --git a/ext/readline/tests/readline_completion_function_001.phpt b/ext/readline/tests/readline_completion_function_001.phpt
index a1d16a6774fc..31d502b7ec72 100644
--- a/ext/readline/tests/readline_completion_function_001.phpt
+++ b/ext/readline/tests/readline_completion_function_001.phpt
@@ -18,7 +18,7 @@ foreach ($data as $callback) {
try {
var_dump(readline_completion_function($callback));
} catch (\TypeError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
}
@@ -26,5 +26,5 @@ foreach ($data as $callback) {
--EXPECT--
bool(true)
bool(true)
-readline_completion_function(): Argument #1 ($callback) must be a valid callback, no array or string given
-readline_completion_function(): Argument #1 ($callback) must be a valid callback, no array or string given
+TypeError: readline_completion_function(): Argument #1 ($callback) must be a valid callback, no array or string given
+TypeError: readline_completion_function(): Argument #1 ($callback) must be a valid callback, no array or string given
diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt
index 71e4065193dc..1805838d2781 100644
--- a/ext/shmop/tests/001.phpt
+++ b/ext/shmop/tests/001.phpt
@@ -42,7 +42,7 @@ shmop
try {
shmop_write($shm_id, $write_d1, $written);
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
echo "shm open for read only: ";
@@ -77,7 +77,7 @@ shm write test #1: ok
data in memory is: test #1 of the shmop() extension
shm open for read only: ok
data in memory is: test #1 of the shmop() extension
-Read-only segment cannot be written
+Error: Read-only segment cannot be written
shm open for read only: ok
shm write test #2: ok
data in memory is: test #1 of the shmop() extensiontest #2 append data to shared memory segment
diff --git a/ext/shmop/tests/002.phpt b/ext/shmop/tests/002.phpt
index 56aea8fcdcb9..5372b0e95466 100644
--- a/ext/shmop/tests/002.phpt
+++ b/ext/shmop/tests/002.phpt
@@ -13,13 +13,13 @@ echo PHP_EOL, '## shmop_open function tests ##', PHP_EOL;
try {
shmop_open(1338, '', 0644, 1024);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
shmop_open(1338, 'b', 0644, 1024);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
// Warning outputs: Unable to attach or create shared memory segment
@@ -29,14 +29,14 @@ var_dump(shmop_open(0, 'a', 0644, 1024));
try {
shmop_open(0, 'a', 0644, 1024);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
//Shared memory segment size must be greater than zero
try {
shmop_open(1338, "c", 0666, 0);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
echo PHP_EOL, '## shmop_read function tests ##', PHP_EOL;
@@ -45,7 +45,7 @@ $shm_id = shmop_open(1338, 'n', 0600, 1024);
try {
shmop_read($shm_id, -10, 0);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
shmop_delete($shm_id);
@@ -54,7 +54,7 @@ $shm_id = shmop_open(1339, 'n', 0600, 1024);
try {
shmop_read($shm_id, 0, -10);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
shmop_delete($shm_id);
@@ -64,24 +64,24 @@ $shm_id = shmop_open(1340, 'n', 0600, 1024);
try {
shmop_write($shm_id, 'text to try write', -10);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
shmop_delete($shm_id);
?>
--EXPECTF--
## shmop_open function tests ##
-shmop_open(): Argument #2 ($mode) must be a valid access mode
-shmop_open(): Argument #2 ($mode) must be a valid access mode
+ValueError: shmop_open(): Argument #2 ($mode) must be a valid access mode
+ValueError: shmop_open(): Argument #2 ($mode) must be a valid access mode
Warning: shmop_open(): Unable to attach or create shared memory segment "%s" in %s on line %d
bool(false)
Warning: shmop_open(): Unable to attach or create shared memory segment "%s" in %s on line %d
-shmop_open(): Argument #4 ($size) must be greater than 0 for the "c" and "n" access modes
+ValueError: shmop_open(): Argument #4 ($size) must be greater than 0 for the "c" and "n" access modes
## shmop_read function tests ##
-shmop_read(): Argument #2 ($offset) must be between 0 and the segment size
-shmop_read(): Argument #3 ($size) is out of range
+ValueError: shmop_read(): Argument #2 ($offset) must be between 0 and the segment size
+ValueError: shmop_read(): Argument #3 ($size) is out of range
## shmop_write function tests ##
-shmop_write(): Argument #3 ($offset) is out of range
+ValueError: shmop_write(): Argument #3 ($offset) is out of range
diff --git a/ext/shmop/tests/gh9945.phpt b/ext/shmop/tests/gh9945.phpt
index f22f79149bfb..1bf117fc08dd 100644
--- a/ext/shmop/tests/gh9945.phpt
+++ b/ext/shmop/tests/gh9945.phpt
@@ -12,8 +12,8 @@ if (PHP_OS_FAMILY !== 'Linux' && PHP_OS_FAMILY !== 'Windows') die('skip only for
try {
shmop_open(0x100000000, '', 0644, 1);
} catch (ValueError $exception) {
- echo $exception->getMessage(), "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
?>
--EXPECT--
-shmop_open(): Argument #1 ($key) is out of range
+ValueError: shmop_open(): Argument #1 ($key) is out of range
diff --git a/ext/snmp/tests/gh17330.phpt b/ext/snmp/tests/gh17330.phpt
index a6f077a9c860..898b0357fcd9 100644
--- a/ext/snmp/tests/gh17330.phpt
+++ b/ext/snmp/tests/gh17330.phpt
@@ -11,8 +11,8 @@ $session->close();
try {
$session->setSecurity('authPriv', 'MD5', '', 'AES', '');
} catch(Error $e) {
- echo $e->getMessage();
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-Invalid or uninitialized SNMP object
+Error: Invalid or uninitialized SNMP object
diff --git a/ext/snmp/tests/gh21336.phpt b/ext/snmp/tests/gh21336.phpt
index a4070136e550..745bcb27652c 100644
--- a/ext/snmp/tests/gh21336.phpt
+++ b/ext/snmp/tests/gh21336.phpt
@@ -10,32 +10,32 @@ $session = new SNMP(SNMP::VERSION_3, 'localhost', 'user');
try {
$session->setSecurity('authPriv');
} catch (ValueError $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
// auth passphrase NULL
try {
$session->setSecurity('authNoPriv', 'MD5');
} catch (ValueError $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
// priv protocol NULL
try {
$session->setSecurity('authPriv', 'MD5', 'test12345');
} catch (ValueError $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
// priv passphrase NULL
try {
$session->setSecurity('authPriv', 'MD5', 'test12345', 'AES');
} catch (ValueError $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-SNMP::setSecurity(): Argument #2 ($authProtocol) cannot be null when security level is "authNoPriv" or "authPriv"
-SNMP::setSecurity(): Argument #3 ($authPassphrase) cannot be null when security level is "authNoPriv" or "authPriv"
-SNMP::setSecurity(): Argument #4 ($privacyProtocol) cannot be null when security level is "authPriv"
-SNMP::setSecurity(): Argument #5 ($privacyPassphrase) cannot be null when security level is "authPriv"
+ValueError: SNMP::setSecurity(): Argument #2 ($authProtocol) cannot be null when security level is "authNoPriv" or "authPriv"
+ValueError: SNMP::setSecurity(): Argument #3 ($authPassphrase) cannot be null when security level is "authNoPriv" or "authPriv"
+ValueError: SNMP::setSecurity(): Argument #4 ($privacyProtocol) cannot be null when security level is "authPriv"
+ValueError: SNMP::setSecurity(): Argument #5 ($privacyPassphrase) cannot be null when security level is "authPriv"
diff --git a/ext/snmp/tests/gh21682.phpt b/ext/snmp/tests/gh21682.phpt
index 36b455035935..584e6b784c5e 100644
--- a/ext/snmp/tests/gh21682.phpt
+++ b/ext/snmp/tests/gh21682.phpt
@@ -9,7 +9,7 @@ try {
serialize($s);
echo "ERROR: should have thrown\n";
} catch (\Exception $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$s->close();
?>
diff --git a/ext/sodium/tests/bug78114.phpt b/ext/sodium/tests/bug78114.phpt
index b988c09ec23f..cea157e99655 100644
--- a/ext/sodium/tests/bug78114.phpt
+++ b/ext/sodium/tests/bug78114.phpt
@@ -7,8 +7,8 @@ sodium
try {
eval('sodium_bin2hex();');
} catch (Throwable $ex) {
- echo $ex->getMessage(), PHP_EOL;
+ echo $ex::class, ': ', $ex->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-sodium_bin2hex() expects exactly 1 argument, 0 given
+ArgumentCountError: sodium_bin2hex() expects exactly 1 argument, 0 given
diff --git a/ext/sodium/tests/crypto_auth.phpt b/ext/sodium/tests/crypto_auth.phpt
index 8f262414beb8..20b7ba7ebade 100644
--- a/ext/sodium/tests/crypto_auth.phpt
+++ b/ext/sodium/tests/crypto_auth.phpt
@@ -16,7 +16,7 @@ try {
$mac = sodium_crypto_auth($msg, $bad_key);
echo 'Fail!', PHP_EOL;
} catch (SodiumException $ex) {
- echo $ex->getMessage(), PHP_EOL;
+ echo $ex::class, ': ', $ex->getMessage(), PHP_EOL;
}
// Flip the first bit
@@ -41,7 +41,7 @@ var_dump(sodium_crypto_auth_verify($badmac, $msg, $key));
?>
--EXPECT--
bool(true)
-sodium_crypto_auth(): Argument #2 ($key) must be SODIUM_CRYPTO_AUTH_KEYBYTES bytes long
+SodiumException: sodium_crypto_auth(): Argument #2 ($key) must be SODIUM_CRYPTO_AUTH_KEYBYTES bytes long
bool(false)
bool(false)
bool(false)
diff --git a/ext/sodium/tests/crypto_box.phpt b/ext/sodium/tests/crypto_box.phpt
index f77ec1601cf3..82a392d3260c 100644
--- a/ext/sodium/tests/crypto_box.phpt
+++ b/ext/sodium/tests/crypto_box.phpt
@@ -49,7 +49,7 @@ try {
substr($alice_to_bob_kp, 1)
);
} catch (SodiumException $ex) {
- echo $ex->getMessage(), PHP_EOL;
+ echo $ex::class, ': ', $ex->getMessage(), PHP_EOL;
}
sodium_memzero($alice_box_kp);
@@ -142,7 +142,7 @@ bool(true)
bool(true)
bool(true)
bool(true)
-sodium_crypto_box(): Argument #3 ($key_pair) must be SODIUM_CRYPTO_BOX_KEYPAIRBYTES bytes long
+SodiumException: sodium_crypto_box(): Argument #3 ($key_pair) must be SODIUM_CRYPTO_BOX_KEYPAIRBYTES bytes long
bool(true)
string(17) "Hi, this is Alice"
string(21) "Hi Alice! This is Bob"
diff --git a/ext/sodium/tests/crypto_core_ristretto255.phpt b/ext/sodium/tests/crypto_core_ristretto255.phpt
index f1d20fd22aec..65aa52f3eead 100644
--- a/ext/sodium/tests/crypto_core_ristretto255.phpt
+++ b/ext/sodium/tests/crypto_core_ristretto255.phpt
@@ -78,7 +78,7 @@ $s = sodium_crypto_core_ristretto255_random();
try {
$multL = sodium_crypto_scalarmult_ristretto255($s, $L);
} catch (SodiumException $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
$s2 = sodium_crypto_scalarmult_ristretto255($r, $s);
@@ -128,6 +128,6 @@ bool(false)
bool(false)
string(64) "3066f82a1a747d45120d1740f14358531a8f04bbffe6a819f86dfe50f44a0a46"
bool(true)
-Result is identity element
+SodiumException: Result is identity element
bool(true)
bool(true)
diff --git a/ext/sodium/tests/crypto_scalarmult_ristretto255.phpt b/ext/sodium/tests/crypto_scalarmult_ristretto255.phpt
index 0a21d64075dc..3568019cce7c 100644
--- a/ext/sodium/tests/crypto_scalarmult_ristretto255.phpt
+++ b/ext/sodium/tests/crypto_scalarmult_ristretto255.phpt
@@ -14,12 +14,12 @@ $n = str_repeat("\0", SODIUM_CRYPTO_SCALARMULT_RISTRETTO255_SCALARBYTES);
try {
$p = sodium_crypto_scalarmult_ristretto255_base($n);
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
try {
$p2 = sodium_crypto_scalarmult_ristretto255($n, $b);
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
for ($i = 1; $i < 16; $i++) {
@@ -33,13 +33,13 @@ for ($i = 1; $i < 16; $i++) {
try {
sodium_crypto_scalarmult(substr($n, 1), $p);
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
?>
--EXPECT--
-sodium_crypto_scalarmult_ristretto255_base(): Argument #1 ($n) must not be zero
-Result is identity element
+SodiumException: sodium_crypto_scalarmult_ristretto255_base(): Argument #1 ($n) must not be zero
+SodiumException: Result is identity element
string(64) "e2f2ae0a6abc4e71a884a961c500515f58e30b6aa582dd8db6a65945e08d2d76"
string(64) "6a493210f7499cd17fecb510ae0cea23a110e8d5b901f8acadd3095c73a3b919"
string(64) "94741f5d5d52755ece4f23f044ee27d5d1ea1e2bd196b462166b16152a9d0259"
@@ -55,4 +55,4 @@ string(64) "e4549ee16b9aa03099ca208c67adafcafa4c3f3e4e5303de6026e3ca8ff84460"
string(64) "aa52e000df2e16f55fb1032fc33bc42742dad6bd5a8fc0be0167436c5948501f"
string(64) "46376b80f409b29dc2b5f6f0c52591990896e5716f41477cd30085ab7f10301e"
string(64) "e0c418f7c8d9c4cdd7395b93ea124f3ad99021bb681dfc3302a9d99a2e53e64e"
-sodium_crypto_scalarmult(): Argument #1 ($n) must be SODIUM_CRYPTO_SCALARMULT_SCALARBYTES bytes long
+SodiumException: sodium_crypto_scalarmult(): Argument #1 ($n) must be SODIUM_CRYPTO_SCALARMULT_SCALARBYTES bytes long
diff --git a/ext/sodium/tests/crypto_stream_xchacha20.phpt b/ext/sodium/tests/crypto_stream_xchacha20.phpt
index 466734853d70..0db0a4a487c4 100644
--- a/ext/sodium/tests/crypto_stream_xchacha20.phpt
+++ b/ext/sodium/tests/crypto_stream_xchacha20.phpt
@@ -53,27 +53,27 @@ var_dump($stream7_unified === $stream7_concat);
try {
sodium_crypto_stream_xchacha20(-1, $nonce, $key);
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
try {
sodium_crypto_stream_xchacha20($len, substr($nonce, 1), $key);
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
try {
sodium_crypto_stream_xchacha20($len, $nonce, substr($key, 1));
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
try {
sodium_crypto_stream_xchacha20_xor($stream, substr($nonce, 1), $key);
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
try {
sodium_crypto_stream_xchacha20_xor($stream, $nonce, substr($key, 1));
} catch (SodiumException $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
?>
@@ -89,8 +89,8 @@ bool(true)
bool(true)
int(128)
bool(true)
-sodium_crypto_stream_xchacha20(): Argument #1 ($length) must be greater than 0
-sodium_crypto_stream_xchacha20(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long
-sodium_crypto_stream_xchacha20(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long
-sodium_crypto_stream_xchacha20_xor(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long
-sodium_crypto_stream_xchacha20_xor(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long
+SodiumException: sodium_crypto_stream_xchacha20(): Argument #1 ($length) must be greater than 0
+SodiumException: sodium_crypto_stream_xchacha20(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long
+SodiumException: sodium_crypto_stream_xchacha20(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long
+SodiumException: sodium_crypto_stream_xchacha20_xor(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long
+SodiumException: sodium_crypto_stream_xchacha20_xor(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long
diff --git a/ext/sodium/tests/inc_add.phpt b/ext/sodium/tests/inc_add.phpt
index 7652cf851eb2..60dae7db9f75 100644
--- a/ext/sodium/tests/inc_add.phpt
+++ b/ext/sodium/tests/inc_add.phpt
@@ -9,7 +9,7 @@ $notStr = 123;
try {
sodium_increment($notStr);
} catch (SodiumException $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
$str = "abc";
@@ -28,7 +28,7 @@ $notStr = 123;
try {
sodium_add($notStr, $addStr);
} catch (SodiumException $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
$str = "abc";
@@ -43,12 +43,12 @@ var_dump($str, $str2);
?>
--EXPECT--
-a PHP string is required
+SodiumException: a PHP string is required
string(3) "bbc"
string(3) "abc"
string(3) "bbc"
string(3) "abc"
-PHP strings are required
+SodiumException: PHP strings are required
string(3) "cbc"
string(3) "abc"
string(3) "cbc"
diff --git a/ext/sodium/tests/pwhash_memlimit_below_min.phpt b/ext/sodium/tests/pwhash_memlimit_below_min.phpt
index 8913afb382f0..68fe135775c9 100644
--- a/ext/sodium/tests/pwhash_memlimit_below_min.phpt
+++ b/ext/sodium/tests/pwhash_memlimit_below_min.phpt
@@ -13,15 +13,15 @@ $salt = str_repeat("a", SODIUM_CRYPTO_PWHASH_SALTBYTES);
try {
sodium_crypto_pwhash(32, "password", $salt, SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE, 1);
} catch (\ValueError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
sodium_crypto_pwhash_str("password", SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE, 1);
} catch (\ValueError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECTF--
-sodium_crypto_pwhash(): Argument #5 ($memlimit) must be greater than or equal to %d
-sodium_crypto_pwhash_str(): Argument #3 ($memlimit) must be greater than or equal to %d
+ValueError: sodium_crypto_pwhash(): Argument #5 ($memlimit) must be greater than or equal to %d
+ValueError: sodium_crypto_pwhash_str(): Argument #3 ($memlimit) must be greater than or equal to %d
diff --git a/ext/sodium/tests/sodium_crypto_sign_ed25519_pk_to_curve25519_failure_leak.phpt b/ext/sodium/tests/sodium_crypto_sign_ed25519_pk_to_curve25519_failure_leak.phpt
index 1e4e74eecbe0..c2485cc5e780 100644
--- a/ext/sodium/tests/sodium_crypto_sign_ed25519_pk_to_curve25519_failure_leak.phpt
+++ b/ext/sodium/tests/sodium_crypto_sign_ed25519_pk_to_curve25519_failure_leak.phpt
@@ -8,9 +8,9 @@ sodium
try {
sodium_crypto_sign_ed25519_pk_to_curve25519(str_repeat("\x00", SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES));
} catch (SodiumException $e) {
- echo $e->getMessage();
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-conversion failed
+SodiumException: conversion failed
diff --git a/ext/sodium/tests/utils.phpt b/ext/sodium/tests/utils.phpt
index 66969a60bdf4..f60aa4dbd082 100644
--- a/ext/sodium/tests/utils.phpt
+++ b/ext/sodium/tests/utils.phpt
@@ -102,7 +102,7 @@ function sodium_foo()
try {
sodium_foo();
} catch (SodiumException $ex) {
- var_dump($ex->getMessage());
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
?>
@@ -126,4 +126,4 @@ string(25) "base64("O1R") case passed"
string(24) "base64("O1") case passed"
string(23) "base64("O") case passed"
string(4) "abcd"
-string(4) "test"
+SodiumException: test
diff --git a/ext/sqlite3/tests/bug66550.phpt b/ext/sqlite3/tests/bug66550.phpt
index 60477a0b17ae..11548906a5b1 100644
--- a/ext/sqlite3/tests/bug66550.phpt
+++ b/ext/sqlite3/tests/bug66550.phpt
@@ -16,8 +16,8 @@ $db->close();
try {
$stmt->reset();
} catch (\Error $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-The SQLite3 object has not been correctly initialised or is already closed
+Error: The SQLite3 object has not been correctly initialised or is already closed
diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt
index c6cc9ed3b1e2..cfcc7080b9f0 100644
--- a/ext/sqlite3/tests/bug68760.phpt
+++ b/ext/sqlite3/tests/bug68760.phpt
@@ -24,7 +24,7 @@ try {
$db->close();
}
catch(\Exception $e) {
- echo "Exception: ".$e->getMessage();
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
diff --git a/ext/sqlite3/tests/bug72668.phpt b/ext/sqlite3/tests/bug72668.phpt
index 7f33338eb5e6..551ec18cae0c 100644
--- a/ext/sqlite3/tests/bug72668.phpt
+++ b/ext/sqlite3/tests/bug72668.phpt
@@ -16,14 +16,14 @@ try {
var_dump($result);
}
catch(\Exception $e) {
- echo "Exception: ".$e->getMessage();
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
$result = $db->querySingle("SELECT my_udf_md5('test')");
var_dump($result);
}
catch(\Exception $e) {
- echo "Exception: ".$e->getMessage();
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$statement = $db->prepare("SELECT my_udf_md5('test')");
try {
@@ -31,10 +31,12 @@ try {
var_dump($result);
}
catch(\Exception $e) {
- echo "Exception: ".$e->getMessage();
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
Exception: test exception
+
Exception: test exception
+
Exception: test exception
diff --git a/ext/sqlite3/tests/bug77051.phpt b/ext/sqlite3/tests/bug77051.phpt
index 7b44516b7fdf..7cba3ca8c968 100644
--- a/ext/sqlite3/tests/bug77051.phpt
+++ b/ext/sqlite3/tests/bug77051.phpt
@@ -81,4 +81,4 @@ array(3) {
string(4) "TEST"
[2]=>
string(3) "!!!"
-}
\ No newline at end of file
+}
diff --git a/ext/sqlite3/tests/gh9032.phpt b/ext/sqlite3/tests/gh9032.phpt
index 34ca992ab26b..f479cbdfd200 100644
--- a/ext/sqlite3/tests/gh9032.phpt
+++ b/ext/sqlite3/tests/gh9032.phpt
@@ -18,9 +18,9 @@ try {
$st->execute();
var_dump($db->exec('create table db2.r (id int)'));
} catch (SQLite3Exception $ex) {
- echo $ex->getMessage(), PHP_EOL;
+ echo $ex::class, ': ', $ex->getMessage(), PHP_EOL;
}
?>
--EXPECT--
bool(true)
-Unable to prepare statement: not authorized
+SQLite3Exception: Unable to prepare statement: not authorized
diff --git a/ext/sqlite3/tests/gh_sqlite3_escapestring_nul.phpt b/ext/sqlite3/tests/gh_sqlite3_escapestring_nul.phpt
index 49d66a1accf5..25fb24e53170 100644
--- a/ext/sqlite3/tests/gh_sqlite3_escapestring_nul.phpt
+++ b/ext/sqlite3/tests/gh_sqlite3_escapestring_nul.phpt
@@ -17,7 +17,7 @@ foreach ($cases as $in) {
SQLite3::escapeString($in);
echo "FAIL: no exception for ", bin2hex($in), "\n";
} catch (ValueError $e) {
- echo "ValueError: ", $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
}
diff --git a/ext/sqlite3/tests/sqlite3_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt
index 128e8c1b2484..a292bc1e7c74 100644
--- a/ext/sqlite3/tests/sqlite3_02_open.phpt
+++ b/ext/sqlite3/tests/sqlite3_02_open.phpt
@@ -11,9 +11,9 @@ sqlite3
try {
$db = new SQLite3();
} catch (TypeError $e) {
- var_dump($e->getMessage());
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-string(59) "SQLite3::__construct() expects at least 1 argument, 0 given"
+ArgumentCountError: SQLite3::__construct() expects at least 1 argument, 0 given
diff --git a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
index 67037e22695e..777aaffe1190 100644
--- a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
+++ b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
@@ -30,7 +30,7 @@ echo "Check db was closed\n";
try {
var_dump($results->numColumns());
} catch (\Error $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
echo "Done\n";
?>
@@ -50,5 +50,5 @@ array(2) {
Closing database
bool(true)
Check db was closed
-The SQLite3Result object has not been correctly initialised or is already closed
+Error: The SQLite3Result object has not been correctly initialised or is already closed
Done
diff --git a/ext/sqlite3/tests/sqlite3_31_open.phpt b/ext/sqlite3/tests/sqlite3_31_open.phpt
index 3b5705cb98df..3553c1db3ce5 100644
--- a/ext/sqlite3/tests/sqlite3_31_open.phpt
+++ b/ext/sqlite3/tests/sqlite3_31_open.phpt
@@ -12,11 +12,11 @@ try {
$db = new SQLite3(__DIR__ . '/db1.db');
$db->open(__DIR__ . '/db1.db');
} catch (Exception $ex) {
- var_dump($ex->getMessage());
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
?>
--CLEAN--
--EXPECT--
-string(29) "Already initialised DB Object"
+Exception: Already initialised DB Object
diff --git a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
index 497c54062dcb..7af587f639ba 100644
--- a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
+++ b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
@@ -16,13 +16,13 @@ $db = new SQLite3(':memory:');
try {
$db->createAggregate('TESTAGGREGATE', 'aggregate_test_step', 'aggregate_final');
} catch (TypeError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$db->createAggregate('TESTAGGREGATE2', 'aggregate_step', 'aggregate_test_final');
} catch (TypeError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
var_dump($db->createAggregate ('TESTAGGREGATE3', 'aggregate_step', 'aggregate_final'));
@@ -32,7 +32,7 @@ $db->close();
echo "Done"
?>
--EXPECT--
-SQLite3::createAggregate(): Argument #2 ($stepCallback) must be a valid callback, function "aggregate_test_step" not found or invalid function name
-SQLite3::createAggregate(): Argument #3 ($finalCallback) must be a valid callback, function "aggregate_test_final" not found or invalid function name
+TypeError: SQLite3::createAggregate(): Argument #2 ($stepCallback) must be a valid callback, function "aggregate_test_step" not found or invalid function name
+TypeError: SQLite3::createAggregate(): Argument #3 ($finalCallback) must be a valid callback, function "aggregate_test_final" not found or invalid function name
bool(true)
Done
diff --git a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
index 0be7469c8944..57f6e5f380cf 100644
--- a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
@@ -21,9 +21,9 @@ $db = new SQLite3(':memory:');
try {
$db->loadExtension("");
} catch (\Throwable $ex) {
- var_dump($ex->getMessage());
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
?>
--EXPECTF--
-string(63) "SQLite3::loadExtension(): Argument #1 ($name) must not be empty"
+ValueError: SQLite3::loadExtension(): Argument #1 ($name) must not be empty
diff --git a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
index e23d9a8dad84..252801302619 100644
--- a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
+++ b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
@@ -19,7 +19,7 @@ $db = new SQLite3(':memory:');
try {
$db->loadExtension("");
} catch (Extension $ex) {
- var_dump($ex->getMessage());
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
?>
diff --git a/ext/sqlite3/tests/sqlite3_38_backup.phpt b/ext/sqlite3/tests/sqlite3_38_backup.phpt
index 54ca9e95c231..e97ce758b427 100644
--- a/ext/sqlite3/tests/sqlite3_38_backup.phpt
+++ b/ext/sqlite3/tests/sqlite3_38_backup.phpt
@@ -55,4 +55,4 @@ bool(true)
Backup to DB2 (should fail)
Warning: SQLite3::backup(): Backup failed: source database is busy in %s on line %d
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/ext/sqlite3/tests/sqlite3_38_extended_error.phpt b/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
index 433e1efce047..7647980d074f 100644
--- a/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
@@ -33,4 +33,3 @@ Second Extended Error Code: 1555
Closing database
bool(true)
Done
-
diff --git a/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt b/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
index 135c1cdd1095..3e3d290c130b 100644
--- a/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
+++ b/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
@@ -40,4 +40,3 @@ Third (Extended) Error Code: 1555
Closing database
bool(true)
Done
-
diff --git a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
index a4f30040334c..63d50714715a 100644
--- a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
+++ b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
@@ -23,7 +23,7 @@ try {
// This one should fail
var_dump($db->querySingle('CREATE TABLE test (a, b);'));
} catch (\Exception $e) {
- echo $e->getMessage() . "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
// Test disabling the authorizer
@@ -53,7 +53,7 @@ $db->setAuthorizer(function () {
try {
var_dump($db->querySingle('SELECT 1;'));
} catch (\Exception $e) {
- echo $e->getMessage() . "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
echo $e->getPrevious()->getMessage() . "\n";
}
@@ -64,14 +64,14 @@ $db->setAuthorizer(function () {
try {
var_dump($db->querySingle('SELECT 1;'));
} catch (\Exception $e) {
- echo $e->getMessage() . "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
echo $e->getPrevious()->getMessage() . "\n";
}
?>
--EXPECT--
int(1)
-Unable to prepare statement: not authorized
+SQLite3Exception: Unable to prepare statement: not authorized
bool(true)
int(42)
string(6) "SELECT"
@@ -98,7 +98,7 @@ string(28) "sqlite_master,rootpage,main,"
string(4) "READ"
string(28) "sqlite_master,rootpage,main,"
bool(true)
-Unable to prepare statement: not authorized
+SQLite3Exception: Unable to prepare statement: not authorized
The authorizer callback returned an invalid type: expected int
-Unable to prepare statement: not authorized
+SQLite3Exception: Unable to prepare statement: not authorized
The authorizer callback returned an invalid value: 4200
diff --git a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
index a072f31c9476..4669f57ded16 100644
--- a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
+++ b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
@@ -13,7 +13,7 @@ var_dump($db->enableExceptions(true));
try{
$db->query("SELECT * FROM non_existent_table");
} catch(Exception $e) {
- echo $e->getMessage().PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
var_dump($db->enableExceptions(false));
$db->query("SELECT * FROM non_existent_table");
@@ -23,7 +23,7 @@ echo "Done\n";
?>
--EXPECTF--
bool(false)
-no such table: non_existent_table
+SQLite3Exception: no such table: non_existent_table
Deprecated: SQLite3::enableExceptions(): Use of warnings for SQLite3 is deprecated in %s
bool(true)
diff --git a/ext/sqlite3/tests/sqlite3_explain.phpt b/ext/sqlite3/tests/sqlite3_explain.phpt
index 1f9d4fc940e4..710e6a51fbec 100644
--- a/ext/sqlite3/tests/sqlite3_explain.phpt
+++ b/ext/sqlite3/tests/sqlite3_explain.phpt
@@ -41,13 +41,13 @@ var_dump($result);
try {
$stmts->setExplain(-1);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
$stmts->setExplain(256);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
var_dump($stmts->explain() == Sqlite3Stmt::EXPLAIN_MODE_PREPARED);
@@ -385,6 +385,6 @@ array(2) {
string(13) "second_insert"
}
}
-SQLite3Stmt::setExplain(): Argument #1 ($mode) must be one of the SQLite3Stmt::EXPLAIN_MODE_* constants
-SQLite3Stmt::setExplain(): Argument #1 ($mode) must be one of the SQLite3Stmt::EXPLAIN_MODE_* constants
+ValueError: SQLite3Stmt::setExplain(): Argument #1 ($mode) must be one of the SQLite3Stmt::EXPLAIN_MODE_* constants
+ValueError: SQLite3Stmt::setExplain(): Argument #1 ($mode) must be one of the SQLite3Stmt::EXPLAIN_MODE_* constants
bool(true)
diff --git a/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer.phpt b/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer.phpt
index 9a89d36f8e68..9793dcc230e1 100644
--- a/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer.phpt
+++ b/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer.phpt
@@ -30,7 +30,7 @@ try {
// This one should fail
var_dump($db->querySingle('CREATE TABLE test (a, b);'));
} catch (\Exception $e) {
- echo $e->getMessage() . "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
@@ -38,4 +38,4 @@ try {
Trampoline for authorizer
int(1)
Trampoline for authorizer
-Unable to prepare statement: not authorized
+SQLite3Exception: Unable to prepare statement: not authorized
diff --git a/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer_null.phpt b/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer_null.phpt
index 2cea279f077e..d0fbc16a7d24 100644
--- a/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer_null.phpt
+++ b/ext/sqlite3/tests/sqlite3_trampoline_setauthorizer_null.phpt
@@ -17,7 +17,7 @@ try {
// This one should fail
var_dump($db->querySingle('CREATE TABLE test (a, b);'));
} catch (\Exception $e) {
- echo $e->getMessage() . "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
diff --git a/ext/sysvmsg/tests/005.phpt b/ext/sysvmsg/tests/005.phpt
index ec36c85b75ff..a38761ebffb8 100644
--- a/ext/sysvmsg/tests/005.phpt
+++ b/ext/sysvmsg/tests/005.phpt
@@ -31,7 +31,7 @@ foreach ($tests as $i => $q) {
try {
msg_receive($q, 0, $null, 0, $msg);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
var_dump(msg_send($q, 1, 'foo', true, true, $errno));
@@ -46,7 +46,7 @@ bool(false)
bool(false)
bool(false)
bool(true)
-msg_receive(): Argument #4 ($max_message_size) must be greater than 0
+ValueError: msg_receive(): Argument #4 ($max_message_size) must be greater than 0
Warning: msg_send(): msgsnd failed: Invalid argument in %s on line %d
bool(false)
@@ -56,7 +56,7 @@ bool(false)
bool(false)
bool(false)
bool(true)
-msg_receive(): Argument #4 ($max_message_size) must be greater than 0
+ValueError: msg_receive(): Argument #4 ($max_message_size) must be greater than 0
Warning: msg_send(): msgsnd failed: Invalid argument in %s on line %d
bool(false)
diff --git a/ext/sysvmsg/tests/006.phpt b/ext/sysvmsg/tests/006.phpt
index ae608c6c1fbf..3e59d4a5cd86 100644
--- a/ext/sysvmsg/tests/006.phpt
+++ b/ext/sysvmsg/tests/006.phpt
@@ -14,7 +14,7 @@ foreach ($tests as $elem) {
try {
var_dump(msg_send($queue, 1, $elem, false));
} catch (TypeError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
unset($msg);
@@ -57,12 +57,12 @@ bool(true)
bool(true)
bool(false)
Sending/receiving '':
-msg_send(): Argument #3 ($message) must be of type string|int|float|bool, null given
+TypeError: msg_send(): Argument #3 ($message) must be of type string|int|float|bool, null given
bool(false)
bool(true)
bool(false)
Sending/receiving 'Array':
-msg_send(): Argument #3 ($message) must be of type string|int|float|bool, array given
+TypeError: msg_send(): Argument #3 ($message) must be of type string|int|float|bool, array given
bool(false)
bool(false)
bool(false)
diff --git a/ext/sysvmsg/tests/gh16592.phpt b/ext/sysvmsg/tests/gh16592.phpt
index d48927b4dfee..57393e360fe6 100644
--- a/ext/sysvmsg/tests/gh16592.phpt
+++ b/ext/sysvmsg/tests/gh16592.phpt
@@ -13,10 +13,10 @@ $q = msg_get_queue(0, 0600);
try {
msg_send($q, 1, new Test, true);
} catch (\TypeError $e) {
- echo $e->getMessage();
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
} finally {
msg_remove_queue($q);
}
?>
--EXPECT--
-Test::__serialize() must return an array
+TypeError: Test::__serialize() must return an array
diff --git a/ext/sysvmsg/tests/gh9945.phpt b/ext/sysvmsg/tests/gh9945.phpt
index e346bde9fc29..6f6158e81c35 100644
--- a/ext/sysvmsg/tests/gh9945.phpt
+++ b/ext/sysvmsg/tests/gh9945.phpt
@@ -12,13 +12,13 @@ if (PHP_OS_FAMILY !== 'Linux') die('skip only for platforms with 32-bit key_t');
try {
msg_queue_exists(0x100000000);
} catch (ValueError $exception) {
- echo $exception::class, ": ", $exception->getMessage(), "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
msg_get_queue(0x100000000);
} catch (ValueError $exception) {
- echo $exception::class, ": ", $exception->getMessage(), "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
?>
--EXPECT--
diff --git a/ext/sysvsem/tests/gh9945.phpt b/ext/sysvsem/tests/gh9945.phpt
index a7959eb21563..57791692b523 100644
--- a/ext/sysvsem/tests/gh9945.phpt
+++ b/ext/sysvsem/tests/gh9945.phpt
@@ -12,7 +12,7 @@ if (PHP_OS_FAMILY !== 'Linux') die('skip only for platforms with 32-bit key_t');
try {
sem_get(0x100000000);
} catch (ValueError $exception) {
- echo $exception::class, ": ", $exception->getMessage(), "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
?>
--EXPECT--
diff --git a/ext/sysvshm/tests/001.phpt b/ext/sysvshm/tests/001.phpt
index 10b258da2d0b..f97ff5eb0b36 100644
--- a/ext/sysvshm/tests/001.phpt
+++ b/ext/sysvshm/tests/001.phpt
@@ -13,19 +13,19 @@ if (!function_exists('ftok')){ print 'skip'; }
try {
ftok("","");
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
ftok(-1, -1);
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
ftok("qwertyu","qwertyu");
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
var_dump(ftok("nonexistentfile","q"));
@@ -35,9 +35,9 @@ var_dump(ftok(__FILE__,"q"));
echo "Done\n";
?>
--EXPECTF--
-ftok(): Argument #1 ($filename) must not be empty
-ftok(): Argument #2 ($project_id) must be a single character
-ftok(): Argument #2 ($project_id) must be a single character
+ValueError: ftok(): Argument #1 ($filename) must not be empty
+ValueError: ftok(): Argument #2 ($project_id) must be a single character
+ValueError: ftok(): Argument #2 ($project_id) must be a single character
Warning: ftok(): ftok() failed - No such file or directory in %s on line %d
int(-1)
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index d9a91c580e93..2521a388cfd4 100644
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -15,31 +15,31 @@ $key = ftok(__FILE__, 't');
try {
shm_attach(-1, 0);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
shm_attach(0, -1);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
shm_attach(123, -1);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
shm_attach($key, -1);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
shm_attach($key, 0);
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
var_dump($s = shm_attach($key, 1024));
@@ -57,11 +57,11 @@ shm_remove($s);
echo "Done\n";
?>
--EXPECTF--
-shm_attach(): Argument #2 ($size) must be greater than 0
-shm_attach(): Argument #2 ($size) must be greater than 0
-shm_attach(): Argument #2 ($size) must be greater than 0
-shm_attach(): Argument #2 ($size) must be greater than 0
-shm_attach(): Argument #2 ($size) must be greater than 0
+ValueError: shm_attach(): Argument #2 ($size) must be greater than 0
+ValueError: shm_attach(): Argument #2 ($size) must be greater than 0
+ValueError: shm_attach(): Argument #2 ($size) must be greater than 0
+ValueError: shm_attach(): Argument #2 ($size) must be greater than 0
+ValueError: shm_attach(): Argument #2 ($size) must be greater than 0
object(SysvSharedMemory)#%d (0) {
}
object(SysvSharedMemory)#%d (0) {
diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt
index 1d842fb92759..4fbdb918966d 100644
--- a/ext/sysvshm/tests/003.phpt
+++ b/ext/sysvshm/tests/003.phpt
@@ -18,13 +18,13 @@ var_dump(shm_detach($s));
try {
shm_detach($s);
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
shm_remove($s);
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
echo "Done\n";
@@ -39,6 +39,6 @@ shm_remove($s);
?>
--EXPECT--
bool(true)
-Shared memory block has already been destroyed
-Shared memory block has already been destroyed
+Error: Shared memory block has already been destroyed
+Error: Shared memory block has already been destroyed
Done
diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
index edbf9288acce..35da41adc54b 100644
--- a/ext/sysvshm/tests/006.phpt
+++ b/ext/sysvshm/tests/006.phpt
@@ -16,7 +16,7 @@ $s = shm_attach($key, 1024);
try {
shm_put_var($s, 1, "test string");
} catch (TypeError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
var_dump(shm_remove_var($s, -10));
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index 544c39deb00a..da0ebfb89e6f 100644
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -19,12 +19,12 @@ shm_detach($s);
try {
shm_remove($s);
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
echo "Done\n";
?>
--EXPECT--
bool(true)
-Shared memory block has already been destroyed
+Error: Shared memory block has already been destroyed
Done
diff --git a/ext/sysvshm/tests/gh16591.phpt b/ext/sysvshm/tests/gh16591.phpt
index fb1c58168f57..031b20956720 100644
--- a/ext/sysvshm/tests/gh16591.phpt
+++ b/ext/sysvshm/tests/gh16591.phpt
@@ -19,11 +19,11 @@ $cleanup = shm_attach($key);
try {
shm_put_var($mem, 1, new C);
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
} finally {
shm_remove($cleanup);
}
?>
--EXPECT--
-Shared memory block has been destroyed by the serialization function
+Error: Shared memory block has been destroyed by the serialization function
diff --git a/ext/sysvshm/tests/gh9945.phpt b/ext/sysvshm/tests/gh9945.phpt
index 8185d39b0981..cc53e5e1eafa 100644
--- a/ext/sysvshm/tests/gh9945.phpt
+++ b/ext/sysvshm/tests/gh9945.phpt
@@ -12,8 +12,8 @@ if (PHP_OS_FAMILY !== 'Linux' && PHP_OS_FAMILY !== 'Windows') die('skip only for
try {
shm_attach(0x100000000, 0);
} catch (ValueError $exception) {
- echo $exception->getMessage(), "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
?>
--EXPECT--
-shm_attach(): Argument #1 ($key) is out of range
+ValueError: shm_attach(): Argument #1 ($key) is out of range
diff --git a/ext/sysvshm/tests/serialize_exception.phpt b/ext/sysvshm/tests/serialize_exception.phpt
index aae237e0fb38..a311600ec223 100644
--- a/ext/sysvshm/tests/serialize_exception.phpt
+++ b/ext/sysvshm/tests/serialize_exception.phpt
@@ -17,11 +17,11 @@ class Test {
try {
shm_put_var($s, 1, new Test);
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
shm_remove($s);
?>
--EXPECT--
-no
+Error: no
diff --git a/ext/tidy/tests/007.phpt b/ext/tidy/tests/007.phpt
index fbb3731b1d01..09acb879dd21 100644
--- a/ext/tidy/tests/007.phpt
+++ b/ext/tidy/tests/007.phpt
@@ -17,13 +17,13 @@ var_dump($a->getopt("tab-size"));
try {
$a->getopt('bogus-opt');
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
tidy_getopt($a, 'non-ASCII string ���');
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
?>
@@ -31,5 +31,5 @@ try {
Current Value of 'tidy-mark': bool(false)
Current Value of 'error-file': string(0) ""
Current Value of 'tab-size': int(8)
-tidy::getOpt(): Argument #1 ($option) is an invalid configuration option, "bogus-opt" given
-tidy_getopt(): Argument #2 ($option) is an invalid configuration option, "non-ASCII string ���" given
+ValueError: tidy::getOpt(): Argument #1 ($option) is an invalid configuration option, "bogus-opt" given
+ValueError: tidy_getopt(): Argument #2 ($option) is an invalid configuration option, "non-ASCII string ���" given
diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt
index 9bf6cf6349a3..411719cce25e 100644
--- a/ext/tidy/tests/019.phpt
+++ b/ext/tidy/tests/019.phpt
@@ -15,12 +15,12 @@ tidy_repair_string($l, $l, $l);
try {
tidy_repair_file($s, $l, $l, $l);
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
tidy_repair_file($s, $s, $s, $s);
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
tidy_repair_file($l, $l, $l ,$l); // This doesn't emit any warning, TODO look into
@@ -37,6 +37,6 @@ Warning: tidy_repair_string(): Could not load the Tidy configuration file "" in
Warning: tidy_repair_string(): Could not load the Tidy configuration file "1" in %s on line %d
Warning: tidy_repair_string(): Could not set encoding "1" in %s on line %d
-Path must not be empty
-Path must not be empty
+ValueError: Path must not be empty
+ValueError: Path must not be empty
Done
diff --git a/ext/tidy/tests/021.phpt b/ext/tidy/tests/021.phpt
index f4c2a99017f8..22e351e4d9dc 100644
--- a/ext/tidy/tests/021.phpt
+++ b/ext/tidy/tests/021.phpt
@@ -10,7 +10,7 @@ tidy
try {
tidy_get_opt_doc(new tidy, 'some_bogus_cfg');
} catch (ValueError $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
$t = new tidy;
@@ -18,6 +18,6 @@ var_dump($t->getOptDoc('ncr'));
var_dump(strlen(tidy_get_opt_doc($t, 'wrap')) > 99);
?>
--EXPECT--
-tidy_get_opt_doc(): Argument #2 ($option) is an invalid configuration option, "some_bogus_cfg" given
+ValueError: tidy_get_opt_doc(): Argument #2 ($option) is an invalid configuration option, "some_bogus_cfg" given
string(73) "This option specifies if Tidy should allow numeric character references. "
bool(true)
diff --git a/ext/tidy/tests/036.phpt b/ext/tidy/tests/036.phpt
index d328c4862fe7..0de72c10c6be 100644
--- a/ext/tidy/tests/036.phpt
+++ b/ext/tidy/tests/036.phpt
@@ -11,65 +11,65 @@ $node = $tidy->body();
try {
$node->value = "";
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->name = "";
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->type = 1;
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->line = 1;
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->column = 1;
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->proprietary = true;
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->id = null;
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->attribute = [];
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
try {
$node->child = [];
} catch (Error $exception) {
- echo $exception->getMessage() . "\n";
+ echo $exception::class, ': ', $exception->getMessage(), "\n";
}
?>
--EXPECT--
-Cannot modify readonly property tidyNode::$value
-Cannot modify readonly property tidyNode::$name
-Cannot modify readonly property tidyNode::$type
-Cannot modify readonly property tidyNode::$line
-Cannot modify readonly property tidyNode::$column
-Cannot modify readonly property tidyNode::$proprietary
-Cannot modify readonly property tidyNode::$id
-Cannot modify readonly property tidyNode::$attribute
-Cannot modify readonly property tidyNode::$child
+Error: Cannot modify readonly property tidyNode::$value
+Error: Cannot modify readonly property tidyNode::$name
+Error: Cannot modify readonly property tidyNode::$type
+Error: Cannot modify readonly property tidyNode::$line
+Error: Cannot modify readonly property tidyNode::$column
+Error: Cannot modify readonly property tidyNode::$proprietary
+Error: Cannot modify readonly property tidyNode::$id
+Error: Cannot modify readonly property tidyNode::$attribute
+Error: Cannot modify readonly property tidyNode::$child
diff --git a/ext/tidy/tests/bug77040.phpt b/ext/tidy/tests/bug77040.phpt
index 417c5e5f8924..a4f4c1613aa9 100644
--- a/ext/tidy/tests/bug77040.phpt
+++ b/ext/tidy/tests/bug77040.phpt
@@ -22,4 +22,4 @@ bool(true)
bool(true)
bool(false)
bool(true)
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/ext/tidy/tests/gh20374.phpt b/ext/tidy/tests/gh20374.phpt
index 73299856b081..fb7bca73ee61 100644
--- a/ext/tidy/tests/gh20374.phpt
+++ b/ext/tidy/tests/gh20374.phpt
@@ -50,7 +50,7 @@ foreach ($values as $key => $value) {
$tidy->parseString($str, $config, 'utf8');
echo $tidy->value, "\n";
} catch (Throwable $e) {
- echo $e::class, ": ", $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
}
diff --git a/ext/tidy/tests/gh21682.phpt b/ext/tidy/tests/gh21682.phpt
index 33ec0045961c..f1b7bce1ff09 100644
--- a/ext/tidy/tests/gh21682.phpt
+++ b/ext/tidy/tests/gh21682.phpt
@@ -9,7 +9,7 @@ try {
serialize($t);
echo "ERROR: should have thrown\n";
} catch (\Exception $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$t->parseString("test");
@@ -18,7 +18,7 @@ try {
serialize($node);
echo "ERROR: should have thrown\n";
} catch (\Exception $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
diff --git a/ext/tidy/tests/open_basedir_failure_config.phpt b/ext/tidy/tests/open_basedir_failure_config.phpt
index 3b12c9e4ea8f..e7bdfd46f881 100644
--- a/ext/tidy/tests/open_basedir_failure_config.phpt
+++ b/ext/tidy/tests/open_basedir_failure_config.phpt
@@ -20,7 +20,7 @@ echo "=== __construct ===\n";
try {
$tidy = new tidy(__DIR__.'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/open_basedir/test.html', 'my_config_file.ini');
} catch (Exception $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
echo "=== parseFile ===\n";
@@ -42,7 +42,7 @@ Warning: tidy_parse_string(): open_basedir restriction in effect. File(my_config
Warning: tidy_parse_file(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d
=== __construct ===
-tidy::__construct(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir)
+Exception: tidy::__construct(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir)
=== parseFile ===
Warning: tidy::parseFile(): open_basedir restriction in effect. File(my_config_file.ini) is not within the allowed path(s): (%sopen_basedir) in %s on line %d
diff --git a/ext/tidy/tests/parsing_inexistent_file.phpt b/ext/tidy/tests/parsing_inexistent_file.phpt
index e5f73c5388ce..ca9690683500 100644
--- a/ext/tidy/tests/parsing_inexistent_file.phpt
+++ b/ext/tidy/tests/parsing_inexistent_file.phpt
@@ -13,7 +13,7 @@ var_dump(tidy_parse_file("does_not_exist.html"));
try {
$tidy = new tidy("does_not_exist.html");
} catch (Exception $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECTF--
@@ -22,4 +22,4 @@ bool(false)
Warning: tidy_parse_file(): Cannot load "does_not_exist.html" into memory in %s on line %d
bool(false)
-Cannot load "does_not_exist.html" into memory
+Exception: Cannot load "does_not_exist.html" into memory
diff --git a/ext/tidy/tests/tidy_error1.phpt b/ext/tidy/tests/tidy_error1.phpt
index 5e7593762a93..e565db3aecea 100644
--- a/ext/tidy/tests/tidy_error1.phpt
+++ b/ext/tidy/tests/tidy_error1.phpt
@@ -14,14 +14,14 @@ $tidy = new tidy();
try {
$tidy->parseString($buffer, $config);
} catch (\ValueError $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$config = ['neither'];
try {
$tidy->parseString($buffer, $config);
} catch (\TypeError $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$config = ['doctype-mode' => 'customtag'];
@@ -29,7 +29,7 @@ $config = ['doctype-mode' => 'customtag'];
try {
var_dump($tidy->parseString($buffer, $config));
} catch (\ValueError $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$config = ['doctype' => 'php'];
@@ -37,7 +37,7 @@ $config = ['doctype' => 'php'];
try {
var_dump($tidy->parseString($buffer, $config));
} catch (\TypeError $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$config = ['doctype' => 'auto', 0 => 'value2'];
@@ -45,7 +45,7 @@ $config = ['doctype' => 'auto', 0 => 'value2'];
try {
var_dump($tidy->parseString($buffer, $config));
} catch (\TypeError $e) {
- echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
diff --git a/ext/tidy/tests/uninitialized.phpt b/ext/tidy/tests/uninitialized.phpt
index 7793f9725b19..38dd124c9623 100644
--- a/ext/tidy/tests/uninitialized.phpt
+++ b/ext/tidy/tests/uninitialized.phpt
@@ -9,21 +9,21 @@ $tidy = new tidy;
try {
var_dump($tidy->getHtmlVer());
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump($tidy->isXhtml());
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
var_dump($tidy->isXml());
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-tidy object is not initialized
-tidy object is not initialized
-tidy object is not initialized
+Error: tidy object is not initialized
+Error: tidy object is not initialized
+Error: tidy object is not initialized
diff --git a/ext/tokenizer/tests/PhpToken_extension_errors.phpt b/ext/tokenizer/tests/PhpToken_extension_errors.phpt
index c0676c6b7952..241bdae61572 100644
--- a/ext/tokenizer/tests/PhpToken_extension_errors.phpt
+++ b/ext/tokenizer/tests/PhpToken_extension_errors.phpt
@@ -12,7 +12,7 @@ class MyPhpToken1 extends PhpToken {
try {
var_dump(MyPhpToken1::tokenize("getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
abstract class MyPhpToken2 extends PhpToken {
@@ -21,10 +21,10 @@ abstract class MyPhpToken2 extends PhpToken {
try {
var_dump(MyPhpToken2::tokenize("getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-Undefined constant "UNKNOWN"
-Cannot instantiate abstract class MyPhpToken2
+Error: Undefined constant "UNKNOWN"
+Error: Cannot instantiate abstract class MyPhpToken2
diff --git a/ext/tokenizer/tests/PhpToken_methods.phpt b/ext/tokenizer/tests/PhpToken_methods.phpt
index 13aee9856931..80d149f6ddf0 100644
--- a/ext/tokenizer/tests/PhpToken_methods.phpt
+++ b/ext/tokenizer/tests/PhpToken_methods.phpt
@@ -40,12 +40,12 @@ echo "\nError:\n";
try {
$token->is(3.141);
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$token->is([3.141]);
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
unset($token->id);
@@ -53,22 +53,22 @@ unset($token->text);
try {
$token->is(T_FUNCTION);
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$token->is('function');
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$token->is([T_FUNCTION]);
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
$token->is(['function']);
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
echo "\nName of unknown token:\n";
@@ -110,12 +110,12 @@ bool(false)
bool(false)
Error:
-PhpToken::is(): Argument #1 ($kind) must be of type string|int|array, float given
-PhpToken::is(): Argument #1 ($kind) must only have elements of type string|int, float given
-Typed property PhpToken::$id must not be accessed before initialization
-Typed property PhpToken::$text must not be accessed before initialization
-Typed property PhpToken::$id must not be accessed before initialization
-Typed property PhpToken::$text must not be accessed before initialization
+TypeError: PhpToken::is(): Argument #1 ($kind) must be of type string|int|array, float given
+TypeError: PhpToken::is(): Argument #1 ($kind) must only have elements of type string|int, float given
+Error: Typed property PhpToken::$id must not be accessed before initialization
+Error: Typed property PhpToken::$text must not be accessed before initialization
+Error: Typed property PhpToken::$id must not be accessed before initialization
+Error: Typed property PhpToken::$text must not be accessed before initialization
Name of unknown token:
NULL
diff --git a/ext/tokenizer/tests/parse_errors.phpt b/ext/tokenizer/tests/parse_errors.phpt
index 2985272b3749..9e44105e9249 100644
--- a/ext/tokenizer/tests/parse_errors.phpt
+++ b/ext/tokenizer/tests/parse_errors.phpt
@@ -9,7 +9,7 @@ function test_parse_error($code) {
try {
var_dump(token_get_all($code, TOKEN_PARSE));
} catch (ParseError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
foreach (token_get_all($code) as $token) {
@@ -29,7 +29,7 @@ test_parse_error('
--EXPECT--
-Invalid numeric literal
+ParseError: Invalid numeric literal
T_OPEN_TAG (getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
echo "Done";
?>
--EXPECT--
-syntax error, unexpected identifier "code"
+ParseError: syntax error, unexpected identifier "code"
Done
diff --git a/ext/tokenizer/tests/token_get_all_heredoc_nowdoc.phpt b/ext/tokenizer/tests/token_get_all_heredoc_nowdoc.phpt
index 6b3010d7cf41..62fc1a9c74bb 100644
--- a/ext/tokenizer/tests/token_get_all_heredoc_nowdoc.phpt
+++ b/ext/tokenizer/tests/token_get_all_heredoc_nowdoc.phpt
@@ -15,7 +15,7 @@ function test(string $code, int $flags)
}
}
} catch (ParseError $e) {
- echo "Parse error: {$e->getMessage()} on line {$e->getLine()}\n";
+ echo $e::class, ': ', $e->getMessage(), ' on line ', $e->getLine(), "\n";
}
}
@@ -326,11 +326,11 @@ Line 2: T_END_HEREDOC (' INNER_END')
Test case 5
-Parse error: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 2
+ParseError: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 2
Test case 6
-Parse error: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 2
+ParseError: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 2
Test case 7
@@ -343,7 +343,7 @@ Line 3: T_END_HEREDOC ('INNER_END')
Test case 8
-Parse error: Invalid indentation - tabs and spaces cannot be mixed on line 3
+ParseError: Invalid indentation - tabs and spaces cannot be mixed on line 3
Test case 9
@@ -365,7 +365,7 @@ Line 3: T_END_HEREDOC (' INNER_END')
Test case 11
-Parse error: Invalid body indentation level (expecting an indentation level of at least 3) on line 2
+ParseError: Invalid body indentation level (expecting an indentation level of at least 3) on line 2
Test case 12
@@ -396,7 +396,7 @@ Line 3: T_END_HEREDOC (' INNER_END')
Test case 15
-Parse error: Invalid body indentation level (expecting an indentation level of at least 3) on line 2
+ParseError: Invalid body indentation level (expecting an indentation level of at least 3) on line 2
Test case 16
@@ -409,8 +409,8 @@ Line 3: T_END_HEREDOC (' INNER_END')
Test case 17
-Parse error: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 4
+ParseError: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 4
Test case 18
-Parse error: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 4
+ParseError: syntax error, unexpected end of file, expecting variable or heredoc end or "${" or "{$" on line 4
diff --git a/ext/zend_test/tests/gh13970.phpt b/ext/zend_test/tests/gh13970.phpt
index f6b68f897023..bdf6d0891fc7 100644
--- a/ext/zend_test/tests/gh13970.phpt
+++ b/ext/zend_test/tests/gh13970.phpt
@@ -15,8 +15,8 @@ $reflection = new ReflectionFunction('test');
try {
var_dump($reflection->getAttributes()[0]->newInstance());
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-Attribute::__construct(): Argument #1 ($flags) must be of type int, ZendTestUnitEnum given
+Error: Attribute::__construct(): Argument #1 ($flags) must be of type int, ZendTestUnitEnum given
diff --git a/ext/zend_test/tests/gh14741.phpt b/ext/zend_test/tests/gh14741.phpt
index 389692f3de2b..c9b064d3207c 100644
--- a/ext/zend_test/tests/gh14741.phpt
+++ b/ext/zend_test/tests/gh14741.phpt
@@ -9,9 +9,9 @@ $it = $subject->getIterator();
try {
clone $it;
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-Trying to clone an uncloneable object of class InternalIterator
+Error: Trying to clone an uncloneable object of class InternalIterator
TraversableTest::drop
diff --git a/ext/zend_test/tests/gh16266.phpt b/ext/zend_test/tests/gh16266.phpt
index 44cb7ef807c1..ed755515d7f0 100644
--- a/ext/zend_test/tests/gh16266.phpt
+++ b/ext/zend_test/tests/gh16266.phpt
@@ -8,14 +8,14 @@ try {
$o = new _ZendTestClass();
$o->test('a', 'b', c: 'c');
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
_ZendTestClass::test('a', 'b', c: 'c');
} catch (Error $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-Unknown named parameter $c
-Unknown named parameter $c
+Error: Unknown named parameter $c
+Error: Unknown named parameter $c
diff --git a/ext/zend_test/tests/gh17899.phpt b/ext/zend_test/tests/gh17899.phpt
index 58f445a3b7bf..8d8ac963227c 100644
--- a/ext/zend_test/tests/gh17899.phpt
+++ b/ext/zend_test/tests/gh17899.phpt
@@ -32,4 +32,3 @@ Stack trace:
thrown in on line %d
-
diff --git a/ext/zend_test/tests/gh19720.phpt b/ext/zend_test/tests/gh19720.phpt
index 627444c4793a..fabdcaf70512 100644
--- a/ext/zend_test/tests/gh19720.phpt
+++ b/ext/zend_test/tests/gh19720.phpt
@@ -15,8 +15,8 @@ set_error_handler(function ($_, $errstr) {
try {
var_dump(Test::MyConst);
} catch (Exception $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-Constant ZEND_TEST_DEPRECATED is deprecated
+Exception: Constant ZEND_TEST_DEPRECATED is deprecated
diff --git a/ext/zend_test/tests/gh22169.phpt b/ext/zend_test/tests/gh22169.phpt
index 5ed2ab22fa21..2511a36f0456 100644
--- a/ext/zend_test/tests/gh22169.phpt
+++ b/ext/zend_test/tests/gh22169.phpt
@@ -19,4 +19,3 @@ var_dump(_ZendTestClass::$escapeInterpolated);
string(44) "424547494e200a0d090b1b0c5c242241414120454e44"
string(43) "BEGIN \n\r\t\v\e\f\\\\$\"\101\x41\u{41} END"
string(14) "begin $ \$ end"
-
diff --git a/ext/zend_test/tests/internal_dnf_arguments.phpt b/ext/zend_test/tests/internal_dnf_arguments.phpt
index eb6f5fb514f0..47f0aba19d1d 100644
--- a/ext/zend_test/tests/internal_dnf_arguments.phpt
+++ b/ext/zend_test/tests/internal_dnf_arguments.phpt
@@ -15,7 +15,7 @@ var_dump((string)$paramType);
try {
zend_test_internal_dnf_arguments(new stdClass);
} catch (\Throwable $err) {
- echo $err->getMessage(), "\n";
+ echo $err::class, ': ', $err->getMessage(), "\n";
}
$obj = new \ArrayIterator([]);
@@ -26,7 +26,7 @@ var_dump($result);
--EXPECT--
string(32) "Iterator|(Traversable&Countable)"
string(32) "Iterator|(Traversable&Countable)"
-zend_test_internal_dnf_arguments(): Argument #1 ($arg) must be of type Iterator|(Traversable&Countable), stdClass given
+TypeError: zend_test_internal_dnf_arguments(): Argument #1 ($arg) must be of type Iterator|(Traversable&Countable), stdClass given
object(ArrayIterator)#5 (1) {
["storage":"ArrayIterator":private]=>
array(0) {
diff --git a/ext/zend_test/tests/observer_bug81430_1.phpt b/ext/zend_test/tests/observer_bug81430_1.phpt
index aedfc09ed249..5754fa00f51a 100644
--- a/ext/zend_test/tests/observer_bug81430_1.phpt
+++ b/ext/zend_test/tests/observer_bug81430_1.phpt
@@ -38,4 +38,4 @@ call_user_func([$r->getAttributes(A::class)[0], 'newInstance']);
-
\ No newline at end of file
+
diff --git a/ext/zend_test/tests/observer_error_04.phpt b/ext/zend_test/tests/observer_error_04.phpt
index 2a45bfe78c48..dc1955606575 100644
--- a/ext/zend_test/tests/observer_error_04.phpt
+++ b/ext/zend_test/tests/observer_error_04.phpt
@@ -25,7 +25,7 @@ function main()
try {
main();
} catch (SoapFault $e) {
- echo $e->getMessage() . PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
echo 'Done.' . PHP_EOL;
@@ -45,7 +45,7 @@ echo 'Done.' . PHP_EOL;
-
+SoapFault:
diff --git a/ext/zend_test/tests/observer_preload.phpt b/ext/zend_test/tests/observer_preload.phpt
index 042c9e088e53..731cc2efa798 100644
--- a/ext/zend_test/tests/observer_preload.phpt
+++ b/ext/zend_test/tests/observer_preload.phpt
@@ -43,4 +43,4 @@ echo 'Done' . PHP_EOL;
Done
-
\ No newline at end of file
+
diff --git a/ext/zend_test/tests/zend_forbid_dynamic_call.phpt b/ext/zend_test/tests/zend_forbid_dynamic_call.phpt
index 77d8649f5322..0e8a8d170092 100644
--- a/ext/zend_test/tests/zend_forbid_dynamic_call.phpt
+++ b/ext/zend_test/tests/zend_forbid_dynamic_call.phpt
@@ -13,17 +13,17 @@ try {
$call = [$object, 'call'];
$call();
} catch (Error $error) {
- echo $error->getMessage(), "\n";
+ echo $error::class, ': ', $error->getMessage(), "\n";
}
try {
$callStatic = [ZendTestForbidDynamicCall::class, 'callStatic'];
$callStatic();
} catch (Error $error) {
- echo $error->getMessage(), "\n";
+ echo $error::class, ': ', $error->getMessage(), "\n";
}
?>
--EXPECT--
-Cannot call ZendTestForbidDynamicCall::call() dynamically
-Cannot call ZendTestForbidDynamicCall::callStatic() dynamically
+Error: Cannot call ZendTestForbidDynamicCall::call() dynamically
+Error: Cannot call ZendTestForbidDynamicCall::callStatic() dynamically
diff --git a/ext/zend_test/tests/zend_internal_class_prop_intersection.phpt b/ext/zend_test/tests/zend_internal_class_prop_intersection.phpt
index dd9fe93a130e..f7f421f27d87 100644
--- a/ext/zend_test/tests/zend_internal_class_prop_intersection.phpt
+++ b/ext/zend_test/tests/zend_internal_class_prop_intersection.phpt
@@ -28,12 +28,12 @@ try {
try {
$o->classIntersectionProp = new EmptyIterator();
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
$o->classIntersectionProp = new C();
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$o->classIntersectionProp = new I();
@@ -41,6 +41,6 @@ $o->classIntersectionProp = new I();
==DONE==
--EXPECT--
Error: Typed property _ZendTestClass::$classIntersectionProp must not be accessed before initialization
-Cannot assign EmptyIterator to property _ZendTestClass::$classIntersectionProp of type Traversable&Countable
-Cannot assign C to property _ZendTestClass::$classIntersectionProp of type Traversable&Countable
+TypeError: Cannot assign EmptyIterator to property _ZendTestClass::$classIntersectionProp of type Traversable&Countable
+TypeError: Cannot assign C to property _ZendTestClass::$classIntersectionProp of type Traversable&Countable
==DONE==
diff --git a/ext/zend_test/tests/zend_test_compile_string.phpt b/ext/zend_test/tests/zend_test_compile_string.phpt
index fb47f748f87a..543c086bdb7a 100644
--- a/ext/zend_test/tests/zend_test_compile_string.phpt
+++ b/ext/zend_test/tests/zend_test_compile_string.phpt
@@ -46,7 +46,7 @@ EOF;
try {
zend_test_compile_string($source_string, "Sources\0string", ZEND_COMPILE_POSITION_AT_OPEN_TAG);
} catch (\ValueError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
zend_test_compile_string(null, null, null);
@@ -65,7 +65,7 @@ string(3) "php"
string(3) "php"
string(3) "php"
string(3) "php"
-zend_test_compile_string(): Argument #2 ($filename) must not contain any null bytes
+ValueError: zend_test_compile_string(): Argument #2 ($filename) must not contain any null bytes
Deprecated: zend_test_compile_string(): Passing null to parameter #1 ($source_string) of type string is deprecated in %s on line %d
diff --git a/ext/zlib/tests/deflate_add_error.phpt b/ext/zlib/tests/deflate_add_error.phpt
index af7b95b79011..b4fc42aaf31f 100644
--- a/ext/zlib/tests/deflate_add_error.phpt
+++ b/ext/zlib/tests/deflate_add_error.phpt
@@ -9,7 +9,7 @@ $badResource = fopen("php://memory", "r+");
try {
var_dump(deflate_add($badResource, "test"));
} catch (\TypeError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$resource = deflate_init(ZLIB_ENCODING_DEFLATE);
@@ -18,10 +18,10 @@ $badFlushType = 6789;
try {
var_dump(deflate_add($resource, "test", $badFlushType));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-deflate_add(): Argument #1 ($context) must be of type DeflateContext, resource given
-deflate_add(): Argument #3 ($flush_mode) must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, or ZLIB_FINISH
+TypeError: deflate_add(): Argument #1 ($context) must be of type DeflateContext, resource given
+ValueError: deflate_add(): Argument #3 ($flush_mode) must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, or ZLIB_FINISH
diff --git a/ext/zlib/tests/deflate_init_error.phpt b/ext/zlib/tests/deflate_init_error.phpt
index 6752b650e248..9fe0323a7d22 100644
--- a/ext/zlib/tests/deflate_init_error.phpt
+++ b/ext/zlib/tests/deflate_init_error.phpt
@@ -8,37 +8,37 @@ zlib
try {
var_dump(deflate_init(42));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['level' => 42]));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['level' => -2]));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 0]));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 10]));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-deflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
-deflate_init(): "level" option must be between -1 and 9
-deflate_init(): "level" option must be between -1 and 9
-deflate_init(): "memory" option must be between 1 and 9
-deflate_init(): "memory" option must be between 1 and 9
+ValueError: deflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: deflate_init(): "level" option must be between -1 and 9
+ValueError: deflate_init(): "level" option must be between -1 and 9
+ValueError: deflate_init(): "memory" option must be between 1 and 9
+ValueError: deflate_init(): "memory" option must be between 1 and 9
diff --git a/ext/zlib/tests/deflate_init_strategy_type_error.phpt b/ext/zlib/tests/deflate_init_strategy_type_error.phpt
index 2a59082bc320..7b2e9184529a 100644
--- a/ext/zlib/tests/deflate_init_strategy_type_error.phpt
+++ b/ext/zlib/tests/deflate_init_strategy_type_error.phpt
@@ -11,32 +11,32 @@ $fp = fopen('php://memory', 'r');
try {
deflate_init(ZLIB_ENCODING_DEFLATE, ['level' => 'foo']);
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => []]);
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
deflate_init(ZLIB_ENCODING_DEFLATE, ['window' => new A()]);
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
deflate_init(ZLIB_ENCODING_DEFLATE, ['strategy' => $fp]);
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
fclose($fp);
?>
--EXPECT--
-deflate_init(): Argument #2 ($options) the value for option "level" must be of type int, string given
-deflate_init(): Argument #2 ($options) the value for option "memory" must be of type int, array given
-deflate_init(): Argument #2 ($options) the value for option "window" must be of type int, A given
-deflate_init(): Argument #2 ($options) the value for option "strategy" must be of type int, resource given
+TypeError: deflate_init(): Argument #2 ($options) the value for option "level" must be of type int, string given
+TypeError: deflate_init(): Argument #2 ($options) the value for option "memory" must be of type int, array given
+TypeError: deflate_init(): Argument #2 ($options) the value for option "window" must be of type int, A given
+TypeError: deflate_init(): Argument #2 ($options) the value for option "strategy" must be of type int, resource given
diff --git a/ext/zlib/tests/gh16326.phpt b/ext/zlib/tests/gh16326.phpt
index b4997368549f..fe7eb1370957 100644
--- a/ext/zlib/tests/gh16326.phpt
+++ b/ext/zlib/tests/gh16326.phpt
@@ -7,20 +7,20 @@ zlib
try {
deflate_init(ZLIB_ENCODING_DEFLATE, ["dictionary" => [" ", ""]]);
} catch (ValueError $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
try {
deflate_init(ZLIB_ENCODING_DEFLATE, ["dictionary" => ["hello", "wor\0ld"]]);
} catch (ValueError $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
try {
deflate_init(ZLIB_ENCODING_DEFLATE, ["dictionary" => [" ", new stdClass]]);
} catch (Error $ex) {
- echo $ex->getMessage(), "\n";
+ echo $ex::class, ': ', $ex->getMessage(), "\n";
}
?>
--EXPECT--
-deflate_init(): Argument #2 ($options) must not contain empty strings
-deflate_init(): Argument #2 ($options) must not contain strings with null bytes
-Object of class stdClass could not be converted to string
+ValueError: deflate_init(): Argument #2 ($options) must not contain empty strings
+ValueError: deflate_init(): Argument #2 ($options) must not contain strings with null bytes
+Error: Object of class stdClass could not be converted to string
diff --git a/ext/zlib/tests/gh22142.phpt b/ext/zlib/tests/gh22142.phpt
index 84397a4e85a9..9bbb9332df30 100644
--- a/ext/zlib/tests/gh22142.phpt
+++ b/ext/zlib/tests/gh22142.phpt
@@ -12,9 +12,9 @@ class Options {
try {
deflate_init(ZLIB_ENCODING_DEFLATE, new Options());
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-deflate_init(): Argument #2 ($options) the value for option "level" must be of type int, null given
+TypeError: deflate_init(): Argument #2 ($options) the value for option "level" must be of type int, null given
diff --git a/ext/zlib/tests/gzclose_basic.phpt b/ext/zlib/tests/gzclose_basic.phpt
index f2e03a579de5..28a215681c0c 100644
--- a/ext/zlib/tests/gzclose_basic.phpt
+++ b/ext/zlib/tests/gzclose_basic.phpt
@@ -16,7 +16,7 @@ var_dump(gzclose($h));
try {
gzread($h, 20);
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
$h = gzopen($f, 'r');
@@ -27,13 +27,13 @@ var_dump(fclose($h));
try {
gzread($h, 20);
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
bool(true)
-gzread(): Argument #1 ($stream) must be an open stream resource
+TypeError: gzread(): Argument #1 ($stream) must be an open stream resource
bool(true)
-gzread(): Argument #1 ($stream) must be an open stream resource
+TypeError: gzread(): Argument #1 ($stream) must be an open stream resource
diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt
index b21743755417..f21daedd537e 100644
--- a/ext/zlib/tests/gzcompress_error1.phpt
+++ b/ext/zlib/tests/gzcompress_error1.phpt
@@ -16,7 +16,7 @@ $bad_level = 99;
try {
var_dump(gzcompress($data, $bad_level));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
echo "\n-- Testing with invalid encoding --\n";
@@ -25,7 +25,7 @@ $encoding = 99;
try {
var_dump(gzcompress($data, $level, $encoding));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
@@ -33,7 +33,7 @@ try {
*** Testing gzcompress() : error conditions ***
-- Testing with incorrect compression level --
-gzcompress(): Argument #2 ($level) must be between -1 and 9
+ValueError: gzcompress(): Argument #2 ($level) must be between -1 and 9
-- Testing with invalid encoding --
-gzcompress(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: gzcompress(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt
index 9b065edfc24e..75959f85cb09 100644
--- a/ext/zlib/tests/gzdeflate_error1.phpt
+++ b/ext/zlib/tests/gzdeflate_error1.phpt
@@ -17,7 +17,7 @@ $bad_level = 99;
try {
var_dump(gzdeflate($data, $bad_level));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
echo "\n-- Testing with incorrect encoding --\n";
@@ -26,7 +26,7 @@ $bad_encoding = 99;
try {
var_dump(gzdeflate($data, $level, $bad_encoding));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
@@ -34,7 +34,7 @@ try {
*** Testing gzdeflate() : error conditions ***
-- Testing with incorrect compression level --
-gzdeflate(): Argument #2 ($level) must be between -1 and 9
+ValueError: gzdeflate(): Argument #2 ($level) must be between -1 and 9
-- Testing with incorrect encoding --
-gzdeflate(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: gzdeflate(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt
index 8428d3b950dc..c15d47f5b1f5 100644
--- a/ext/zlib/tests/gzencode_error1.phpt
+++ b/ext/zlib/tests/gzencode_error1.phpt
@@ -19,7 +19,7 @@ $bad_level = 99;
try {
var_dump(gzencode($data, $bad_level));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
echo "\n-- Testing with incorrect encoding_mode --\n";
@@ -27,7 +27,7 @@ $bad_mode = 99;
try {
var_dump(gzencode($data, $level, $bad_mode));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
@@ -35,7 +35,7 @@ try {
*** Testing gzencode() : error conditions ***
-- Testing with incorrect compression level --
-gzencode(): Argument #2 ($level) must be between -1 and 9
+ValueError: gzencode(): Argument #2 ($level) must be between -1 and 9
-- Testing with incorrect encoding_mode --
-gzencode(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: gzencode(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
diff --git a/ext/zlib/tests/gzencode_invalid.phpt b/ext/zlib/tests/gzencode_invalid.phpt
index e64bb294b3e8..98df53825feb 100644
--- a/ext/zlib/tests/gzencode_invalid.phpt
+++ b/ext/zlib/tests/gzencode_invalid.phpt
@@ -8,17 +8,17 @@ zlib
try {
var_dump(gzencode("", -10));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
var_dump(gzencode("", 100));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
var_dump(gzencode("", 1, 100));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
var_dump(gzencode("", -1, ZLIB_ENCODING_GZIP));
@@ -32,7 +32,7 @@ Lies in the darkness";
try {
var_dump(gzencode($string, 9, 3));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
var_dump(gzencode($string, -1, ZLIB_ENCODING_GZIP));
@@ -40,11 +40,11 @@ var_dump(gzencode($string, 9, ZLIB_ENCODING_DEFLATE));
?>
--EXPECTF--
-gzencode(): Argument #2 ($level) must be between -1 and 9
-gzencode(): Argument #2 ($level) must be between -1 and 9
-gzencode(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: gzencode(): Argument #2 ($level) must be between -1 and 9
+ValueError: gzencode(): Argument #2 ($level) must be between -1 and 9
+ValueError: gzencode(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
string(%d) "%a"
string(%d) "%a"
-gzencode(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: gzencode(): Argument #3 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
string(%d) "%a"
string(%d) "%a"
diff --git a/ext/zlib/tests/gzeof_variation1.phpt b/ext/zlib/tests/gzeof_variation1.phpt
index fb4191fa7940..55bfc55cab40 100644
--- a/ext/zlib/tests/gzeof_variation1.phpt
+++ b/ext/zlib/tests/gzeof_variation1.phpt
@@ -17,11 +17,11 @@ gzclose($h);
try {
var_dump(gzeof($h));
} catch (TypeError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
unlink($filename);
?>
--EXPECT--
bool(false)
bool(false)
-gzeof(): Argument #1 ($stream) must be an open stream resource
+TypeError: gzeof(): Argument #1 ($stream) must be an open stream resource
diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index f33abba0284b..922718ce0181 100644
--- a/ext/zlib/tests/gzfile_variation15.phpt
+++ b/ext/zlib/tests/gzfile_variation15.phpt
@@ -99,4 +99,3 @@ array(1) {
[0]=>
string(28) "This is a file in script dir"
}
-
diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt
index 0118dd3ea130..78f512f9d923 100644
--- a/ext/zlib/tests/gzopen_variation9.phpt
+++ b/ext/zlib/tests/gzopen_variation9.phpt
@@ -40,4 +40,3 @@ mode=e
Warning: gzopen(): Failed to open stream: %s in %s on line %d
gzopen=bool(false)
-
diff --git a/ext/zlib/tests/gzread_error2.phpt b/ext/zlib/tests/gzread_error2.phpt
index 0a3d08efd09a..ab7231f64c93 100644
--- a/ext/zlib/tests/gzread_error2.phpt
+++ b/ext/zlib/tests/gzread_error2.phpt
@@ -10,13 +10,13 @@ var_dump(gzread($h, 10));
try {
var_dump(gzread($h, 0));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
var_dump(gzread($h, 5));
try {
var_dump(gzread($h, -1));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
var_dump(gzread($h, 8));
gzclose($h);
@@ -24,7 +24,7 @@ gzclose($h);
?>
--EXPECT--
string(10) "When you'r"
-gzread(): Argument #2 ($length) must be greater than 0
+ValueError: gzread(): Argument #2 ($length) must be greater than 0
string(5) "e tau"
-gzread(): Argument #2 ($length) must be greater than 0
+ValueError: gzread(): Argument #2 ($length) must be greater than 0
string(8) "ght thro"
diff --git a/ext/zlib/tests/gzwrite_error2.phpt b/ext/zlib/tests/gzwrite_error2.phpt
index 5201f8064ae1..1e71e4b55485 100644
--- a/ext/zlib/tests/gzwrite_error2.phpt
+++ b/ext/zlib/tests/gzwrite_error2.phpt
@@ -21,4 +21,3 @@ unlink($filename);
--EXPECT--
int(0)
int(0)
-
diff --git a/ext/zlib/tests/inflate_add_error.phpt b/ext/zlib/tests/inflate_add_error.phpt
index 129fd5b794f7..1d805ba5f9d2 100644
--- a/ext/zlib/tests/inflate_add_error.phpt
+++ b/ext/zlib/tests/inflate_add_error.phpt
@@ -9,7 +9,7 @@ $badResource = fopen("php://memory", "r+");
try {
var_dump(inflate_add($badResource, "test"));
} catch (\TypeError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$resource = inflate_init(ZLIB_ENCODING_DEFLATE);
@@ -17,10 +17,10 @@ $badFlushType = 6789;
try {
var_dump(inflate_add($resource, "test", $badFlushType));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-inflate_add(): Argument #1 ($context) must be of type InflateContext, resource given
-inflate_add(): Argument #3 ($flush_mode) must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, or ZLIB_FINISH
+TypeError: inflate_add(): Argument #1 ($context) must be of type InflateContext, resource given
+ValueError: inflate_add(): Argument #3 ($flush_mode) must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, or ZLIB_FINISH
diff --git a/ext/zlib/tests/inflate_init_error.phpt b/ext/zlib/tests/inflate_init_error.phpt
index 9854f7453909..a5b6f6ca9897 100644
--- a/ext/zlib/tests/inflate_init_error.phpt
+++ b/ext/zlib/tests/inflate_init_error.phpt
@@ -8,9 +8,9 @@ zlib
try {
var_dump(inflate_init(42));
} catch (\ValueError $e) {
- echo $e->getMessage() . \PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-inflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: inflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
diff --git a/ext/zlib/tests/inflate_init_window_type_error.phpt b/ext/zlib/tests/inflate_init_window_type_error.phpt
index fbca3129681e..cd4c178f2a2c 100644
--- a/ext/zlib/tests/inflate_init_window_type_error.phpt
+++ b/ext/zlib/tests/inflate_init_window_type_error.phpt
@@ -8,9 +8,9 @@ zlib
try {
inflate_init(ZLIB_ENCODING_DEFLATE, ['window' => []]);
} catch (TypeError $e) {
- echo $e->getMessage(), PHP_EOL;
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
-inflate_init(): Argument #2 ($options) the value for option "window" must be of type int, array given
+TypeError: inflate_init(): Argument #2 ($options) the value for option "window" must be of type int, array given
diff --git a/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt b/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt
index 507e6842cb58..a33aa058faab 100644
--- a/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt
+++ b/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt
@@ -7,14 +7,14 @@ zlib
try {
inflate_init(123456, ["dictionary" => "dict"]);
} catch (ValueError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
try {
deflate_init(123456, ["dictionary" => "dict"]);
} catch (ValueError $e) {
- echo $e->getMessage(), "\n";
+ echo $e::class, ': ', $e->getMessage(), "\n";
}
?>
--EXPECT--
-inflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
-deflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: inflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
+ValueError: deflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE