[PHP-CVS] [php-src] master: ext/json: applied fixers to improve test robustness (#23029)

Author: NickSdot (NickSdot)
Committer: GitHub (web-flow)
Pusher: Girgias
Date: 2026-08-22T14:16:47+01:00

Commit: https://github.com/php/php-src/commit/60adb5034748179823c0df0e4773c09917188318
Raw diff: https://github.com/php/php-src/commit/60adb5034748179823c0df0e4773c09917188318.diff

ext/json: applied fixers to improve test robustness (#23029)

Changed paths:
  M  ext/json/tests/009.phpt
  M  ext/json/tests/bug72787.phpt
  M  ext/json/tests/bug73113.phpt
  M  ext/json/tests/json_decode_error.phpt
  M  ext/json/tests/json_last_error_error.phpt
  M  ext/json/tests/json_last_error_msg_error.phpt
  M  ext/json/tests/json_last_error_msg_error_location_003.phpt
  M  ext/json/tests/json_validate_003.phpt


Diff:

diff --git a/ext/json/tests/009.phpt b/ext/json/tests/009.phpt
index ec9d9dd0f0ee..86ff78cb045c 100644
--- a/ext/json/tests/009.phpt
+++ b/ext/json/tests/009.phpt
@@ -11,4 +11,3 @@ echo "Done\n";
 --EXPECT--
 string(7) "[1,2,3]"
 Done
-
diff --git a/ext/json/tests/bug72787.phpt b/ext/json/tests/bug72787.phpt
index c08bd18ec9b1..637c22014f42 100644
--- a/ext/json/tests/bug72787.phpt
+++ b/ext/json/tests/bug72787.phpt
@@ -7,10 +7,10 @@ Bug #72787 (json_decode reads out of bounds)
 
 try {
     var_dump(json_decode('[]', false, 0x100000000));
-} catch (\ValueError $e) {
-    echo $e->getMessage() . \PHP_EOL;
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECTF--
-json_decode(): Argument #3 ($depth) must be less than %d
+ValueError: json_decode(): Argument #3 ($depth) must be less than %d
diff --git a/ext/json/tests/bug73113.phpt b/ext/json/tests/bug73113.phpt
index d22b0c23f71b..42167569d16d 100644
--- a/ext/json/tests/bug73113.phpt
+++ b/ext/json/tests/bug73113.phpt
@@ -15,9 +15,9 @@ class JsonSerializableObject implements \JsonSerializable
 $obj = new JsonSerializableObject();
 try {
     echo json_encode($obj);
-} catch (\Exception $e) {
-    echo $e->getMessage();
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-This error is expected
+Exception: This error is expected
diff --git a/ext/json/tests/json_decode_error.phpt b/ext/json/tests/json_decode_error.phpt
index 93306a58b39d..d224813a98da 100644
--- a/ext/json/tests/json_decode_error.phpt
+++ b/ext/json/tests/json_decode_error.phpt
@@ -8,8 +8,8 @@ echo "\n-- Testing json_decode() function with depth below 0 --\n";
 
 try {
     var_dump(json_decode('"abc"', true, -1));
-} catch (\ValueError $e) {
-    echo $e->getMessage() . \PHP_EOL;
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
@@ -17,4 +17,4 @@ try {
 *** Testing json_decode() : error conditions ***
 
 -- Testing json_decode() function with depth below 0 --
-json_decode(): Argument #3 ($depth) must be greater than 0
+ValueError: json_decode(): Argument #3 ($depth) must be greater than 0
diff --git a/ext/json/tests/json_last_error_error.phpt b/ext/json/tests/json_last_error_error.phpt
index d98d1988dbac..f098f4e39ceb 100644
--- a/ext/json/tests/json_last_error_error.phpt
+++ b/ext/json/tests/json_last_error_error.phpt
@@ -7,11 +7,11 @@ var_dump(json_last_error());
 
 try {
     var_dump(json_last_error(true));
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
 int(0)
-json_last_error() expects exactly 0 arguments, 1 given
+ArgumentCountError: json_last_error() expects exactly 0 arguments, 1 given
diff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt
index f34cdbbe624c..4afbdb2e744e 100644
--- a/ext/json/tests/json_last_error_msg_error.phpt
+++ b/ext/json/tests/json_last_error_msg_error.phpt
@@ -7,11 +7,11 @@ var_dump(json_last_error_msg());
 
 try {
     var_dump(json_last_error_msg(true));
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
 string(8) "No error"
-json_last_error_msg() expects exactly 0 arguments, 1 given
+ArgumentCountError: json_last_error_msg() expects exactly 0 arguments, 1 given
diff --git a/ext/json/tests/json_last_error_msg_error_location_003.phpt b/ext/json/tests/json_last_error_msg_error_location_003.phpt
index ec5e6b9b4d65..702ba1f43889 100644
--- a/ext/json/tests/json_last_error_msg_error_location_003.phpt
+++ b/ext/json/tests/json_last_error_msg_error_location_003.phpt
@@ -69,4 +69,3 @@ Error on line 7, column 1:
 bool(false)
 int(4)
 string(30) "Syntax error near location 7:1"
-
diff --git a/ext/json/tests/json_validate_003.phpt b/ext/json/tests/json_validate_003.phpt
index cd0545b9a7f9..e538ed72ee61 100644
--- a/ext/json/tests/json_validate_003.phpt
+++ b/ext/json/tests/json_validate_003.phpt
@@ -7,13 +7,13 @@ json_validate() - Error handling for max depth
 
 try {
   var_dump(json_validate("-", PHP_INT_MAX));
-} catch (ValueError $error) {
-  echo $error->getMessage() . PHP_EOL;
+} catch (Throwable $error) {
+  echo $error::class, ': ', $error->getMessage(), "\n";
   var_dump(json_last_error(), json_last_error_msg());
 }
 
 ?>
 --EXPECTF--
-json_validate(): Argument #2 ($depth) must be less than %d
+ValueError: json_validate(): Argument #2 ($depth) must be less than %d
 int(0)
 string(8) "No error"