Change exception printing

kocsismate · kocsismate · commit efecd53ea233 · 2025-11-02T21:00:31.000+01:00
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - basic - multibyte character
 
 try {
     new Uri\Rfc3986\Uri("🐘");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_null_byte1.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_null_byte1.phpt
@@ -6,9 +6,9 @@ Test Uri\Rfc3986\Uri parsing - basic - URI contains null byte
 try {
     new Uri\Rfc3986\Uri("https://exam\0ple.com");
 } catch (ValueError $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-Uri\Rfc3986\Uri::__construct(): Argument #1 ($uri) must not contain any null bytes
+ValueError: Uri\Rfc3986\Uri::__construct(): Argument #1 ($uri) must not contain any null bytes
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_null_byte2.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_null_byte2.phpt
@@ -6,9 +6,9 @@ Test Uri\Rfc3986\Uri parsing - basic - URI contains null byte
 try {
     Uri\Rfc3986\Uri::parse("https://exam\0ple.com");
 } catch (ValueError $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-Uri\Rfc3986\Uri::parse(): Argument #1 ($uri) must not contain any null bytes
+ValueError: Uri\Rfc3986\Uri::parse(): Argument #1 ($uri) must not contain any null bytes
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - host - multibyte character
 
 try {
     new Uri\Rfc3986\Uri("https://exḁmple.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - host - reserved character
 
 try {
     new Uri\Rfc3986\Uri("https://ex[a]mple.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - path - multibyte character
 
 try {
     new Uri\Rfc3986\Uri("https://example.com/fȎȎ");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - path - reserved character
 
 try {
     new Uri\Rfc3986\Uri("https://example.com/fo[o/ba]r/");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - port - multibyte character
 
 try {
     new Uri\Rfc3986\Uri("https://example.com:Ȏ");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt b/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - port - negative value
 
 try {
     var_dump(new Uri\Rfc3986\Uri("http://example.com:-1"));
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - port - percent encoded character
 
 try {
     new Uri\Rfc3986\Uri("https://example.com:%30");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_user_info_wrong_place.phpt b/ext/uri/tests/rfc3986/parsing/port_error_user_info_wrong_place.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - port - user info component is in wrong place
 
 try {
     var_dump(new Uri\Rfc3986\Uri("https://example.com:8080@username:password"));
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - scheme - empty
 
 try {
     new Uri\Rfc3986\Uri("://example.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - scheme - multibyte characters
 
 try {
     new Uri\Rfc3986\Uri("ƕŢŢƤƨ://example.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - scheme - percent encoded character
 
 try {
     new Uri\Rfc3986\Uri("http%2F://example.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - scheme - reserved character
 
 try {
     new Uri\Rfc3986\Uri("http&://example.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - userinfo - extended ASCII character
 
 try {
     new Uri\Rfc3986\Uri("http://úzör@example.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - userinfo - multibyte character
 
 try {
     new Uri\Rfc3986\Uri("http://usĕr:pąss@example.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt
@@ -5,10 +5,10 @@ Test Uri\Rfc3986\Uri parsing - userinfo - reserved character
 
 try {
     new Uri\Rfc3986\Uri("http://us[er]:pass@example.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\InvalidUriException: The specified URI is malformed
diff --git a/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt b/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - basic - empty string
 
 try {
     new Uri\WhatWg\Url("");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed (MissingSchemeNonRelativeUrl)
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (MissingSchemeNonRelativeUrl)
diff --git a/ext/uri/tests/whatwg/parsing/basic_error_null_byte1.phpt b/ext/uri/tests/whatwg/parsing/basic_error_null_byte1.phpt
@@ -6,9 +6,9 @@ Test Uri\WhatWg\Url parsing - basic - URL contains null byte
 try {
     new Uri\WhatWg\Url("https://exam\0ple.com");
 } catch (ValueError $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-Uri\WhatWg\Url::__construct(): Argument #1 ($uri) must not contain any null bytes
+ValueError: Uri\WhatWg\Url::__construct(): Argument #1 ($uri) must not contain any null bytes
diff --git a/ext/uri/tests/whatwg/parsing/basic_error_null_byte2.phpt b/ext/uri/tests/whatwg/parsing/basic_error_null_byte2.phpt
@@ -6,9 +6,9 @@ Test Uri\WhatWg\Url parsing - basic - URL contains null byte
 try {
     Uri\WhatWg\Url::parse("https://exam\0ple.com");
 } catch (ValueError $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-Uri\WhatWg\Url::parse(): Argument #1 ($uri) must not contain any null bytes
+ValueError: Uri\WhatWg\Url::parse(): Argument #1 ($uri) must not contain any null bytes
diff --git a/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt b/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - host - invalid code point
 
 try {
     new Uri\WhatWg\Url("https://ex[a]mple.com");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed (DomainInvalidCodePoint)
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (DomainInvalidCodePoint)
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - host - empty
 
 try {
     new Uri\WhatWg\Url("https://");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed (HostMissing)
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (HostMissing)
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - host - empty
 
 try {
     new Uri\WhatWg\Url("https://user:pass@");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - host - empty
 
 try {
     new Uri\WhatWg\Url("/");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed (MissingSchemeNonRelativeUrl)
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (MissingSchemeNonRelativeUrl)
diff --git a/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt b/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - host - IPvFuture
 
 try {
     new Uri\WhatWg\Url("https://[v7.host]");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed (Ipv6InvalidCodePoint)
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (Ipv6InvalidCodePoint)
diff --git a/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt b/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - host - empty
 
 try {
     new Uri\WhatWg\Url("///");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed (MissingSchemeNonRelativeUrl)
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (MissingSchemeNonRelativeUrl)
diff --git a/ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt b/ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - path - relative reference
 
 try {
     new Uri\WhatWg\Url("foo");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
---EXPECTF--
-The specified URI is malformed (MissingSchemeNonRelativeUrl)
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (MissingSchemeNonRelativeUrl)
diff --git a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_only_query_fragment.phpt b/ext/uri/tests/whatwg/parsing/path_error_relative_reference_only_query_fragment.phpt
@@ -5,10 +5,10 @@ Test Uri\WhatWg\Url parsing - path - relative reference
 
 try {
     new Uri\WhatWg\Url("?query#fragment");
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-The specified URI is malformed (MissingSchemeNonRelativeUrl)
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (MissingSchemeNonRelativeUrl)
diff --git a/ext/uri/tests/whatwg/parsing/path_success_relative_reference_absolute.phpt b/ext/uri/tests/whatwg/parsing/path_success_relative_reference_absolute.phpt
diff --git a/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt b/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
diff --git a/ext/uri/tests/whatwg/parsing/port_error_negative.phpt b/ext/uri/tests/whatwg/parsing/port_error_negative.phpt
diff --git a/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt
diff --git a/ext/uri/tests/whatwg/parsing/port_error_user_info_wrong_place.phpt b/ext/uri/tests/whatwg/parsing/port_error_user_info_wrong_place.phpt
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt
