Commit fd816731799 for php.net

commit fd816731799e47bd06870ca89e916d4de29e808c
Author: NickSdot <32384907+NickSdot@users.noreply.github.com>
Date:   Fri Sep 4 19:41:38 2026 +0700

    ext/uri: Consistency follow up to #23286 (#23551)

diff --git a/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt b/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt
index 284de4e6a52..655f57700ab 100644
--- a/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt
+++ b/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder basic - error - with base URL
+Test Uri\Rfc3986\UriBuilder basic - error - with base URI
 --FILE--
 <?php

@@ -9,7 +9,7 @@
 try {
     $builder->build(new Uri\Rfc3986\Uri("/foo/bar"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt b/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt
index b7a84dc00cf..f98f34a5981 100644
--- a/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt
+++ b/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder basic - success - with base URL
+Test Uri\Rfc3986\UriBuilder basic - success - with base URI
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt
index 8ed2a8938e9..97ec3d167cb 100644
--- a/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setFragment("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt b/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt
index 2a15d5e85a8..a87ef9f5d3b 100644
--- a/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setFragment("főő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt
index ae06238a1f8..7774bd4beb8 100644
--- a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt
+++ b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setHost("ex%3mple.co");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt
index cc514ec6919..49f29269cff 100644
--- a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt
+++ b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder::setHost() - error - invalid percent encoded octet in IPv6
+Test Uri\Rfc3986\UriBuilder::setHost() - error - invalid percent-encoded octet in IPv6
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $builder->setHost("[2001:%308:85a3:0000:0000:8a2e:0370:7334]");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_success_regname.phpt b/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
index 81e93ccfc10..c7288893524 100644
--- a/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
+++ b/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder::setHost() - success - Registered name
+Test Uri\Rfc3986\UriBuilder::setHost() - success - registered name
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt b/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt
index 8cce8d471aa..c95e2ea1444 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt
@@ -9,7 +9,7 @@
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt b/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt
index b1f0a2518f1..ede07bda8fc 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt
@@ -9,7 +9,7 @@
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt b/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt
index 97b6c3e8b85..7b0cd553ae1 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt
@@ -10,7 +10,7 @@
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt
index 039b2277024..3831c67bde7 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setPath("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt b/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt
index 4b40e84c78f..a0d8a4c0c88 100644
--- a/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt
+++ b/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt
@@ -9,7 +9,7 @@
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/port_error_negative.phpt b/ext/uri/tests/rfc3986/builder/port_error_negative.phpt
index 4cbc0e1c69d..0a1dd624b44 100644
--- a/ext/uri/tests/rfc3986/builder/port_error_negative.phpt
+++ b/ext/uri/tests/rfc3986/builder/port_error_negative.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setPort(-1);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt
index ecfced24a44..d53b088b7a5 100644
--- a/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setQuery("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt b/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt
index 4c212cddd63..c8c7f093c03 100644
--- a/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setQuery("főő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt
index 13594c16336..dc325cc77a7 100644
--- a/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt
+++ b/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setScheme("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt b/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt
index c178a0fa1f1..92719c129c3 100644
--- a/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setScheme("1");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt
index 4941db44aa7..1817af42edb 100644
--- a/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setScheme(":");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt b/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt
index a6919e8ffd0..997ff84c694 100644
--- a/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt
+++ b/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt
@@ -9,7 +9,7 @@
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt b/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt
index 0830a57864d..53730dfe529 100644
--- a/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt
+++ b/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setUserInfo("%3");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt
index 9d3fb2544da..6db1fbb5ba6 100644
--- a/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt
@@ -8,7 +8,7 @@
 try {
     $builder->setUserInfo("<>");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/general/array_cast_success.phpt b/ext/uri/tests/rfc3986/general/array_cast_success.phpt
index 9e8e56eb727..9bb133eba76 100644
--- a/ext/uri/tests/rfc3986/general/array_cast_success.phpt
+++ b/ext/uri/tests/rfc3986/general/array_cast_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test casting Uri\Rfc3986\Uri to array
+Test Uri\Rfc3986\Uri array cast - success
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/general/clone_success.phpt b/ext/uri/tests/rfc3986/general/clone_success.phpt
index 915909bb735..6539f0e0291 100644
--- a/ext/uri/tests/rfc3986/general/clone_success.phpt
+++ b/ext/uri/tests/rfc3986/general/clone_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test cloning Uri\Rfc3986\Uri
+Test Uri\Rfc3986\Uri cloning - success
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/general/extension_error.phpt b/ext/uri/tests/rfc3986/general/extension_error.phpt
index 02cc60ff0e2..94b2cc4f957 100644
--- a/ext/uri/tests/rfc3986/general/extension_error.phpt
+++ b/ext/uri/tests/rfc3986/general/extension_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extension of Uri\Rfc3986\Uri
+Test Uri\Rfc3986\Uri extension - error
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt b/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
index 5806ec1f14e..b2b4967f220 100644
--- a/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
+++ b/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri instantiation without calling the constructor
+Test Uri\Rfc3986\Uri instantiation - error - without calling the constructor
 --EXTENSIONS--
 reflection
 uri
diff --git a/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt b/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt
index 0ac7ea3f7ef..c2edc849086 100644
--- a/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt
+++ b/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component retrieval - host type - IP future
+Test Uri\Rfc3986\Uri component retrieval - host type - IPvFuture
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
index 2296a797e66..201ebe23ffb 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - reserved characters
+Test Uri\Rfc3986\Uri::withFragment() - error - reserved characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withFragment("#fragment");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
index 5caea7996c5..18e0af52bbc 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - unicode characters
+Test Uri\Rfc3986\Uri::withFragment() - error - Unicode characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withFragment("ő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
index 2c6285656a7..807ecc3afe2 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - empty string
+Test Uri\Rfc3986\Uri::withFragment() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
index 905ed65f666..ab55b8e4f53 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - URL encoded characters
+Test Uri\Rfc3986\Uri::withFragment() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
index 4b5936880ff..ebecce9ac56 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - changing an existing one
+Test Uri\Rfc3986\Uri::withFragment() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
index 9020a8f3669..5d754f2c04f 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - unsetting existing
+Test Uri\Rfc3986\Uri::withFragment() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt
index 080b2ea9e1b..966ebbbc347 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - unsetting not-existent
+Test Uri\Rfc3986\Uri::withFragment() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
index be724549926..feeaa987f37 100644
--- a/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - reserved characters
+Test Uri\Rfc3986\Uri::withHost() - error - reserved characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withHost("ex#mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt b/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt
index dd3a527ff9e..c5755dcc4f0 100644
--- a/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - unsetting with userinfo
+Test Uri\Rfc3986\Uri::withHost() - error - unsetting with userinfo
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_empty.phpt b/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
index 98187ddee60..71d86c05f8b 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - empty string
+Test Uri\Rfc3986\Uri::withHost() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
index 05bb410f44e..eca76499618 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - URL encoded characters
+Test Uri\Rfc3986\Uri::withHost() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_existing.phpt b/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
index 385c29f985d..b9bcdc498ed 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - changing an existing one
+Test Uri\Rfc3986\Uri::withHost() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt b/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
index 7969559d73a..e1fae015afe 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - IP future address
+Test Uri\Rfc3986\Uri::withHost() - success - IPvFuture address
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt b/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
index 7a2ef3702bc..d146a842ad4 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - IPv4 address
+Test Uri\Rfc3986\Uri::withHost() - success - IPv4 address
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt b/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt
index dbdf0cd877d..a809c1cf135 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - changing IPv4 to IPv6
+Test Uri\Rfc3986\Uri::withHost() - success - changing IPv4 to IPv6
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt b/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
index 521e5645fe6..ac1856fd5ac 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - IPv6 address
+Test Uri\Rfc3986\Uri::withHost() - success - IPv6 address
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_new.phpt b/ext/uri/tests/rfc3986/modification/host_success_new.phpt
index f9d13de087f..a387d4b14c7 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - adding a new one
+Test Uri\Rfc3986\Uri::withHost() - success - adding a new one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt b/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt
index 89fa9502cce..00777a64dd0 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - percent-encoded reserved characters
+Test Uri\Rfc3986\Uri::withHost() - success - percent-encoded reserved characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
index f1887209d49..8d6880703b9 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - unsetting existing
+Test Uri\Rfc3986\Uri::withHost() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt
index 8eb5faeac72..c9d23ec7399 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - unsetting non-existent
+Test Uri\Rfc3986\Uri::withHost() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt b/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
index b629ec8fdd5..97fa180bee5 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - null byte
+Test Uri\Rfc3986\Uri::withPath() - error - null byte
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withPath("/\0foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
index 24863251f94..e539f6cefd0 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - reserved characters
+Test Uri\Rfc3986\Uri::withPath() - error - reserved characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withPath("/[foo]");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
index 1762470ee2a..c86045ef330 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - unicode characters
+Test Uri\Rfc3986\Uri::withPath() - error - Unicode characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withPath("/ő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt b/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt
index 5ab98a5d449..7b8f2a9c8ec 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - without leading slash
+Test Uri\Rfc3986\Uri::withPath() - error - without leading slash
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withPath("foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/path_success_email.phpt b/ext/uri/tests/rfc3986/modification/path_success_email.phpt
index 0ff5a2dd141..f13e1a4fe7a 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_email.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_email.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - using an email format
+Test Uri\Rfc3986\Uri::withPath() - success - using an email format
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/path_success_empty.phpt b/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
index 0f0b3216d3b..bae19eda197 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - empty string
+Test Uri\Rfc3986\Uri::withPath() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
index 536df32ee86..d3d76465b4a 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - URL encoded characters
+Test Uri\Rfc3986\Uri::withPath() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/path_success_existing.phpt b/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
index 13ec3b5d07c..76bd8b76d15 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - changing an existing one
+Test Uri\Rfc3986\Uri::withPath() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt b/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt
index 51ab43185a4..c1d0a8fe9b4 100644
--- a/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - missing host
+Test Uri\Rfc3986\Uri::withPort() - error - missing host
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/port_error_negative.phpt b/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
index 250e01105b5..74d370433d9 100644
--- a/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - too small number
+Test Uri\Rfc3986\Uri::withPort() - error - negative number
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withPort(-1);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt b/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt
index 4710f4fb81b..09aebc4d90f 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - adding with an empty host
+Test Uri\Rfc3986\Uri::withPort() - success - adding with an empty host
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/port_success_existing.phpt b/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
index d3a3d1c7a01..38a1326f8f4 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - changing an existing one
+Test Uri\Rfc3986\Uri::withPort() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/port_success_new.phpt b/ext/uri/tests/rfc3986/modification/port_success_new.phpt
index ce1ebfdca5d..af973e3dd10 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - adding a new one
+Test Uri\Rfc3986\Uri::withPort() - success - adding a new one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
index 6610e75ebc4..2ec5c504408 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - unsetting existing
+Test Uri\Rfc3986\Uri::withPort() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt
index 2c7f14aae78..9bfe494b33b 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - unsetting non-existent
+Test Uri\Rfc3986\Uri::withPort() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt b/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt
index 3783e0122bd..201a6f5b0a2 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - unsetting with an empty host
+Test Uri\Rfc3986\Uri::withPort() - success - unsetting with an empty host
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
index 24c7b36c437..b3e76631338 100644
--- a/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - reserved characters
+Test Uri\Rfc3986\Uri::withQuery() - error - reserved characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withQuery("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
index 5474792e39d..3aa0858174e 100644
--- a/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - unicode characters
+Test Uri\Rfc3986\Uri::withQuery() - error - Unicode characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withQuery("ő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt b/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt
index 437c00d7278..a54b2f7288d 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - context-sensitive reserved character
+Test Uri\Rfc3986\Uri::withQuery() - success - context-sensitive reserved character
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/query_success_empty.phpt b/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
index 44f7ebc42d8..09bb7fe3cb9 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - empty string
+Test Uri\Rfc3986\Uri::withQuery() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
index 1fc9049388c..db73639f6b6 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - URL encoded characters
+Test Uri\Rfc3986\Uri::withQuery() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/query_success_existing.phpt b/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
index de1d67f04d2..56f3bdb76a0 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - changing an existing one
+Test Uri\Rfc3986\Uri::withQuery() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
index 0b3b62a29f7..ff00a7c4e81 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - unsetting existing
+Test Uri\Rfc3986\Uri::withQuery() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt
index 129e4ca680c..aaa4f012603 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - unsetting not-existent
+Test Uri\Rfc3986\Uri::withQuery() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt b/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
index 5ef56841577..57f7f3b44b3 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 1
+Test Uri\Rfc3986\Uri::withHost() - success - round trip not guaranteed (case 1)
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt b/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
index 9e5551ee439..141932a28d1 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 2
+Test Uri\Rfc3986\Uri::withScheme() - success - round trip not guaranteed (case 2)
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt b/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
index 89ae3c0b608..56c12fe7e81 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 3
+Test Uri\Rfc3986\Uri::withHost() - success - round trip not guaranteed (case 3)
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
index b737f94bec7..18f7c48291c 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - empty string
+Test Uri\Rfc3986\Uri::withScheme() - error - empty string
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withScheme("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
index 7b6d179fdc9..092a5eb5540 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - URL encoded characters
+Test Uri\Rfc3986\Uri::withScheme() - error - percent-encoded characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withScheme("http%73");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
index beb94baf955..b55ddd7fffe 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - reserved characters
+Test Uri\Rfc3986\Uri::withScheme() - error - reserved characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withScheme("https:");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt b/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
index d50b76e085d..7ca0de00f66 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - basic case
+Test Uri\Rfc3986\Uri::withScheme() - success - basic case
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
index 7cf806f7b2b..896e8c38f5e 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - unsetting existing
+Test Uri\Rfc3986\Uri::withScheme() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt
index b2817a61f2a..5ce37f79fba 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - unsetting non-existent
+Test Uri\Rfc3986\Uri::withScheme() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
index 2db4f37c2e0..369938e8b94 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - reserved characters
+Test Uri\Rfc3986\Uri::withUserInfo() - error - reserved characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->withUserInfo("us/r:password"); // us/r:password
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
index 0d494c6a60a..03848c4e281 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - empty string
+Test Uri\Rfc3986\Uri::withUserInfo() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
index 61f6ee9d41b..16704980346 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - URL encoded characters
+Test Uri\Rfc3986\Uri::withUserInfo() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
index cc4d4998aca..443dd863594 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - changing an existing one
+Test Uri\Rfc3986\Uri::withUserInfo() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
index 1937c4eba01..e148c2bc925 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - adding a new one
+Test Uri\Rfc3986\Uri::withUserInfo() - success - adding a new one
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
index 1f625d93f76..f006729ec99 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - unsetting existing
+Test Uri\Rfc3986\Uri::withUserInfo() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt
index 13f65e51451..8f164e5e28a 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - unsetting non-existent
+Test Uri\Rfc3986\Uri::withUserInfo() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
index cb6007c844a..081081c805f 100644
--- a/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("🐘");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt
index 91d194e2ff5..3209eec4cb8 100644
--- a/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("https://exam\0ple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
index d901d0fdecb..4d5d2efb97a 100644
--- a/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("https://exḁmple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt b/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt
index be4fc5aa626..dc3331ecc67 100644
--- a/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt
+++ b/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - host - emoji code point
+Test Uri\Rfc3986\Uri parsing - host - emoji character
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
index 0568a027f5b..01f041c188f 100644
--- a/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("https://ex[a]mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
index ded528d0308..3eb651bdeff 100644
--- a/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("https://example.com/fȎȎ");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt
index 2a7efd70256..398bfd6400c 100644
--- a/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("https://example.com/fo[o/ba]r/");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
index 54bcd849e5f..33eb4116c15 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("https://example.com:Ȏ");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt b/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt
index df29c2767f0..1284ac845bf 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt
@@ -6,7 +6,7 @@
 try {
     var_dump(new Uri\Rfc3986\Uri("http://example.com:-1"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt b/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
index 169f74e61de..b4d412bc7c2 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
@@ -5,12 +5,12 @@

 if (PHP_INT_SIZE == 8) {
     $uri = new \Uri\Rfc3986\Uri('https://example.com:9223372036854775807');
-    echo $uri->getPort(), PHP_EOL;
-    echo "2147483647", PHP_EOL;
+    echo $uri->getPort(), "\n";
+    echo "2147483647", "\n";
 } else {
     $uri = new \Uri\Rfc3986\Uri('https://example.com:2147483647');
-    echo "9223372036854775807", PHP_EOL;
-    echo $uri->getPort(), PHP_EOL;
+    echo "9223372036854775807", "\n";
+    echo $uri->getPort(), "\n";
 }

 try {
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
index e38ad85b575..caa5b198273 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - port - percent encoded character
+Test Uri\Rfc3986\Uri parsing - port - percent-encoded character
 --FILE--
 <?php

 try {
     new Uri\Rfc3986\Uri("https://example.com:%30");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
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
index d2632a6f280..26dd223d212 100644
--- 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
@@ -6,7 +6,7 @@
 try {
     var_dump(new Uri\Rfc3986\Uri("https://example.com:8080@username:password"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt b/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
index 7b720ee2c8c..5114bce99f7 100644
--- a/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
+++ b/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - query - emoji code point
+Test Uri\Rfc3986\Uri parsing - query - emoji character
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
index ba686e7fafc..f2b7f93613b 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt
index f638ca80e0c..4972bdeada1 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("ƕŢŢƤƨ://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt
index d4dba6f260a..80a8be51c48 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - scheme - percent encoded character
+Test Uri\Rfc3986\Uri parsing - scheme - percent-encoded character
 --FILE--
 <?php

 try {
     new Uri\Rfc3986\Uri("http%2F://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt
index 99dfb664ea0..ce7eed6ae78 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("http&://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt
index 61ea8ecc3c2..bf12a200e1c 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("http://úzör@example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt
index fbceea77b1c..8d83d632a3a 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("http://usĕr:pąss@example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt
index 3b6caeb7a0e..e505d4a7d31 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\Rfc3986\Uri("http://us[er]:pass@example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_with_base.phpt b/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
similarity index 87%
rename from ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_with_base.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
index 54f96abf14c..789421862b2 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_with_base.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - parse() - absolute URI with base URI
+Test Uri\Rfc3986\Uri::parse() - success - absolute URI with base URI
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_with_base.phpt b/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
similarity index 86%
rename from ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_with_base.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
index ce601e197dd..ee1aa3132d2 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_with_base.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - parse() - relative reference with base URI
+Test Uri\Rfc3986\Uri::parse() - success - relative reference with base URI
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_null_byte.phpt
similarity index 64%
rename from ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_null_byte.phpt
index 26f55896c1b..a5a6d7da299 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - null byte
+Test Uri\Rfc3986\Uri::resolve() - error - null byte in path
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $uri->resolve("/f\0o");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_unicode.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
similarity index 79%
rename from ext/uri/tests/rfc3986/reference_resolution/resolve_error_unicode.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
index 3fcf488074e..26bbffbd0b5 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - unicode
+Test Uri\Rfc3986\Uri::resolve() - error - Unicode character in path
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt
index 433f62fd372..26e2ecb4a64 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - absolute URI
+Test Uri\Rfc3986\Uri::resolve() - success - absolute URI
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt
index b09789c7cf9..908d8fc7d34 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - relative reference
+Test Uri\Rfc3986\Uri::resolve() - success - relative reference
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/serialization/basic_success.phpt b/ext/uri/tests/rfc3986/serialization/basic_success.phpt
index 95b25b30712..8b246aab0ca 100644
--- a/ext/uri/tests/rfc3986/serialization/basic_success.phpt
+++ b/ext/uri/tests/rfc3986/serialization/basic_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri serialization and unserialization
+Test Uri\Rfc3986\Uri serialization and unserialization - success
 --FILE--
 <?php

diff --git a/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt b/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
index ef76114f2f4..c8cfabf022d 100644
--- a/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
+++ b/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GH-22046: Uri\Rfc3986\Uri cannot be unserialized with the unsupported C format
+Test Uri\Rfc3986\Uri unserialize() - error - unsupported C format
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt b/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt
index efc2d928bb6..1c379f5ddd1 100644
--- a/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent encoded octet in IPv6
+Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent-encoded octet in IPv6
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt b/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt
index 7ba24a56a31..154b9dfc918 100644
--- a/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent encoded octet in IPv4
+Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent-encoded octet in IPv4
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/builder/host_success_regname.phpt b/ext/uri/tests/whatwg/builder/host_success_regname.phpt
index d72b919c0af..d8a2465c0bb 100644
--- a/ext/uri/tests/whatwg/builder/host_success_regname.phpt
+++ b/ext/uri/tests/whatwg/builder/host_success_regname.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::setHost() - success - Registered name
+Test Uri\WhatWg\UrlBuilder::setHost() - success - registered name
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
index 4dffda8138c..cf943db6cdd 100644
--- a/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
+++ b/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url equivalence - returns true - identical URIs
+Test Uri\WhatWg\Url equivalence - returns true - identical URLs
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt b/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
index c869299eaab..6b6be92b501 100644
--- a/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
+++ b/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\InvalidUrlException constructor reentry
+Test Uri\WhatWg\InvalidUrlException::__construct() - error - reentry
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt b/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
index e5a473b4a6a..923fe88b753 100644
--- a/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
+++ b/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlValidationError constructor reentry
+Test Uri\WhatWg\UrlValidationError::__construct() - error - reentry
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/general/array_cast_success.phpt b/ext/uri/tests/whatwg/general/array_cast_success.phpt
index bb267a46fe5..7cdbe1ddc33 100644
--- a/ext/uri/tests/whatwg/general/array_cast_success.phpt
+++ b/ext/uri/tests/whatwg/general/array_cast_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test casting Uri\WhatWg\Url to array
+Test Uri\WhatWg\Url array cast - success
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/general/clone_success.phpt b/ext/uri/tests/whatwg/general/clone_success.phpt
index 47885b6fe19..2a1500da3a9 100644
--- a/ext/uri/tests/whatwg/general/clone_success.phpt
+++ b/ext/uri/tests/whatwg/general/clone_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test cloning Uri\WhatWg\Url
+Test Uri\WhatWg\Url cloning - success
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/general/extension_error.phpt b/ext/uri/tests/whatwg/general/extension_error.phpt
index da079b9781d..540b6c0cf8b 100644
--- a/ext/uri/tests/whatwg/general/extension_error.phpt
+++ b/ext/uri/tests/whatwg/general/extension_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extension of Uri\WhatWg\Url
+Test Uri\WhatWg\Url extension - error
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt b/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt
index 088c8f5fb64..8b97899bce0 100644
--- a/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt
+++ b/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url instantiation without calling the constructor
+Test Uri\WhatWg\Url instantiation - error - without calling the constructor
 --EXTENSIONS--
 reflection
 uri
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt b/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
index 7d178691fc0..1184bc2d893 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - characters from the percent encode set
+Test Uri\WhatWg\Url::withFragment() - success - characters from the percent-encode set
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt b/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
index 5131a257400..06a6866dcfc 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - empty string
+Test Uri\WhatWg\Url::withFragment() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt b/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
index ff6e9097772..9d16bc79f54 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - URL encoded characters
+Test Uri\WhatWg\Url::withFragment() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt b/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
index 038fd70ea88..00cd9dce394 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - changing an existing one
+Test Uri\WhatWg\Url::withFragment() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt b/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
index 6e6424f8ef1..12bf55c4963 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - only a hashmark character
+Test Uri\WhatWg\Url::withFragment() - success - only a hashmark character
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
index 30353dc2e9f..9bafc17837d 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - null byte
+Test Uri\WhatWg\Url::withFragment() - success - null byte
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt b/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
index b43631a3415..186a7607e6b 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - unicode characters
+Test Uri\WhatWg\Url::withFragment() - success - Unicode characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
index cee1adc61c5..20af982238b 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - unsetting existing
+Test Uri\WhatWg\Url::withFragment() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt b/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt
index aab507be992..83eeed92a4a 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - unsetting not-existent
+Test Uri\WhatWg\Url::withFragment() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt b/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt
index d4af5c74872..110bfe667d4 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - with leading hashmark
+Test Uri\WhatWg\Url::withFragment() - success - with leading hashmark
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt b/ext/uri/tests/whatwg/modification/host_error_at_sign_opaque.phpt
similarity index 65%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt
rename to ext/uri/tests/whatwg/modification/host_error_at_sign_opaque.phpt
index deca314462b..8aefb1251e4 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_at_sign_opaque.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden host code point
+Test Uri\WhatWg\Url::withHost() - error - at sign in opaque host input
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url = $url->withHost("ex@mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt b/ext/uri/tests/whatwg/modification/host_error_at_sign_special.phpt
similarity index 65%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt
rename to ext/uri/tests/whatwg/modification/host_error_at_sign_special.phpt
index 235960f19b5..52460752c88 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_at_sign_special.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden domain code point
+Test Uri\WhatWg\Url::withHost() - error - at sign in special host input
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url = $url->withHost("ex@mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_colon_opaque.phpt b/ext/uri/tests/whatwg/modification/host_error_colon_opaque.phpt
new file mode 100644
index 00000000000..e27a2544cc0
--- /dev/null
+++ b/ext/uri/tests/whatwg/modification/host_error_colon_opaque.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test Uri\WhatWg\Url::withHost() - error - colon in opaque host input
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("foo://example.com");
+
+try {
+    $url = $url->withHost("ex:mple.com");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified host is malformed
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt b/ext/uri/tests/whatwg/modification/host_error_colon_special.phpt
similarity index 63%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt
rename to ext/uri/tests/whatwg/modification/host_error_colon_special.phpt
index f465bb85f22..5697e183304 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_colon_special.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden domain code point
+Test Uri\WhatWg\Url::withHost() - error - colon in special host input
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url = $url->withHost("ex:mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_empty.phpt b/ext/uri/tests/whatwg/modification/host_error_empty.phpt
index c280140381d..f5c80ab7496 100644
--- a/ext/uri/tests/whatwg/modification/host_error_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - empty string
+Test Uri\WhatWg\Url::withHost() - error - empty string
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->withHost("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt
deleted file mode 100644
index f465bb85f22..00000000000
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden domain code point
---FILE--
-<?php
-
-$url = Uri\WhatWg\Url::parse("https://example.com");
-
-try {
-    $url = $url->withHost("ex:mple.com");
-} catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
-}
-
-?>
---EXPECT--
-Uri\WhatWg\InvalidUrlException: The specified host is malformed
diff --git a/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt b/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
index b6f501a201a..66acd721f7b 100644
--- a/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - null byte
+Test Uri\WhatWg\Url::withHost() - error - null byte
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->withHost("h\0st");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt b/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
index 719a3756a10..ab8c1cf65bd 100644
--- a/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - unsetting existing
+Test Uri\WhatWg\Url::withHost() - error - unsetting existing
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url = $url->withHost(null);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_success_encoded.phpt b/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
index e5e30570ba9..69f53823e91 100644
--- a/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - URL encoded characters
+Test Uri\WhatWg\Url::withHost() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_success_existing.phpt b/ext/uri/tests/whatwg/modification/host_success_existing.phpt
index 45535cb88a8..1d5fc66f7c3 100644
--- a/ext/uri/tests/whatwg/modification/host_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - changing an existing one
+Test Uri\WhatWg\Url::withHost() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt b/ext/uri/tests/whatwg/modification/host_success_hashmark_opaque.phpt
similarity index 75%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt
rename to ext/uri/tests/whatwg/modification/host_success_hashmark_opaque.phpt
index 3e986f0b48b..1bb99b08e44 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_hashmark_opaque.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden host code point
+Test Uri\WhatWg\Url::withHost() - success - hash mark in opaque host input
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt b/ext/uri/tests/whatwg/modification/host_success_hashmark_special.phpt
similarity index 75%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt
rename to ext/uri/tests/whatwg/modification/host_success_hashmark_special.phpt
index a968e140527..8f95fd88e82 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_hashmark_special.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden host code point
+Test Uri\WhatWg\Url::withHost() - success - hash mark in special host input
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_success_idna.phpt b/ext/uri/tests/whatwg/modification/host_success_idna.phpt
index 98c794ad786..0ff8a690e70 100644
--- a/ext/uri/tests/whatwg/modification/host_success_idna.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_idna.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - IDNA characters
+Test Uri\WhatWg\Url::withHost() - success - IDNA characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt b/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
index 143465481f6..a34e0ea2574 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - IPv4 address
+Test Uri\WhatWg\Url::withHost() - success - IPv4 address
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt b/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt
index 52989097f8c..14f7f720bb9 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - changing IPv4 to IPv6
+Test Uri\WhatWg\Url::withHost() - success - changing IPv4 to IPv6
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt b/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
index f6665f6594a..8ad078f5f26 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - IPv6 address
+Test Uri\WhatWg\Url::withHost() - success - IPv6 address
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt b/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt
index b5dd8944660..7c3c7260979 100644
--- a/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt
+++ b/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - error - modifying multiple components with warnings before throwing an exception
+Test Uri\WhatWg\Url component modification - error - earlier warnings not in exception
 --FILE--
 <?php

@@ -12,7 +12,7 @@
 try {
     $url->withScheme("0");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
     var_dump($e->errors);
 }

diff --git a/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
index 242c1743010..88d36bdb36e 100644
--- a/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - characters from the percent encode set
+Test Uri\WhatWg\Url::withPassword() - success - characters from the percent-encode set
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_empty.phpt b/ext/uri/tests/whatwg/modification/password_success_empty.phpt
index 72bb5256cdd..6f7c3a8c686 100644
--- a/ext/uri/tests/whatwg/modification/password_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - empty string
+Test Uri\WhatWg\Url::withPassword() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt b/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt
index 217e8f174d8..84ca2c4e92d 100644
--- a/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - empty host
+Test Uri\WhatWg\Url::withPassword() - success - empty host
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_encoded.phpt b/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
index b7f2f548524..97c1a269f26 100644
--- a/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - URL encoded characters
+Test Uri\WhatWg\Url::withPassword() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_existing.phpt b/ext/uri/tests/whatwg/modification/password_success_existing.phpt
index f3aedc393b2..d27f6debc1d 100644
--- a/ext/uri/tests/whatwg/modification/password_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - changing an existing one
+Test Uri\WhatWg\Url::withPassword() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_new.phpt b/ext/uri/tests/whatwg/modification/password_success_new.phpt
index 5c074a16a9e..b93269c1d56 100644
--- a/ext/uri/tests/whatwg/modification/password_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - adding a new one
+Test Uri\WhatWg\Url::withPassword() - success - adding a new one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
index 3ee703024d7..350a852b403 100644
--- a/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - null byte
+Test Uri\WhatWg\Url::withPassword() - success - null byte
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
index 1f53b4c3b31..083a8a9bce3 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - unsetting existing
+Test Uri\WhatWg\Url::withPassword() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
index 70d405415eb..e783105a4c8 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - unsetting existing
+Test Uri\WhatWg\Url::withPassword() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt
index 62127d73918..ba6083a335b 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - unsetting non-existent
+Test Uri\WhatWg\Url::withPassword() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt
index ea4bac4b06a..4bb5f007672 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting non-existent
+Test Uri\WhatWg\Url::withPassword() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
index a871b6614a7..4e0f9eb9070 100644
--- a/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - characters from the percent encode set
+Test Uri\WhatWg\Url::withPath() - success - characters from the percent-encode set
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/path_success_empty.phpt b/ext/uri/tests/whatwg/modification/path_success_empty.phpt
index e17856f26db..54847894ebb 100644
--- a/ext/uri/tests/whatwg/modification/path_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - empty string
+Test Uri\WhatWg\Url::withPath() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/path_success_encoded.phpt b/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
index 5ee661454f4..2b432acf3d3 100644
--- a/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - URL encoded characters
+Test Uri\WhatWg\Url::withPath() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/path_success_existing.phpt b/ext/uri/tests/whatwg/modification/path_success_existing.phpt
index ec7918a5a4f..38b818085d1 100644
--- a/ext/uri/tests/whatwg/modification/path_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - changing an existing one
+Test Uri\WhatWg\Url::withPath() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
index e753771aa9b..0520f93b1e1 100644
--- a/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - null byte
+Test Uri\WhatWg\Url::withPath() - success - null byte
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/path_success_unicode.phpt b/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
index 1a54a0882a4..0cf0aa29ad1 100644
--- a/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - unicode characters
+Test Uri\WhatWg\Url::withPath() - success - Unicode characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt b/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt
index c0991afb096..a48b0f8b5b2 100644
--- a/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - without leading slash
+Test Uri\WhatWg\Url::withPath() - success - without leading slash
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_error_negative.phpt b/ext/uri/tests/whatwg/modification/port_error_negative.phpt
index 1c6f447acd1..4993a7dbdec 100644
--- a/ext/uri/tests/whatwg/modification/port_error_negative.phpt
+++ b/ext/uri/tests/whatwg/modification/port_error_negative.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - negative number
+Test Uri\WhatWg\Url::withPort() - error - negative number
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->withPort(-1);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/port_error_too_large.phpt b/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
index a7270fd5f41..f641cce37ed 100644
--- a/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
+++ b/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - larger than a 16-bit unsigned integer
+Test Uri\WhatWg\Url::withPort() - error - larger than a 16-bit unsigned integer
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt b/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt
index e7a6b94207e..528e2549d3c 100644
--- a/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - empty host
+Test Uri\WhatWg\Url::withPort() - success - empty host
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_existing.phpt b/ext/uri/tests/whatwg/modification/port_success_existing.phpt
index f84e0a9c2de..0ff800d88c2 100644
--- a/ext/uri/tests/whatwg/modification/port_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - changing an existing one
+Test Uri\WhatWg\Url::withPort() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt b/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt
index e49d075035d..c4103d4aa31 100644
--- a/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - file scheme
+Test Uri\WhatWg\Url::withPort() - success - file scheme
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_new.phpt b/ext/uri/tests/whatwg/modification/port_success_new.phpt
index de23a1934ac..f71f1278ad3 100644
--- a/ext/uri/tests/whatwg/modification/port_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - adding a new one
+Test Uri\WhatWg\Url::withPort() - success - adding a new one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_special1.phpt b/ext/uri/tests/whatwg/modification/port_success_special1.phpt
index 979a41a3a8e..b85babc39a0 100644
--- a/ext/uri/tests/whatwg/modification/port_success_special1.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_special1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - adding a new one for a special URL
+Test Uri\WhatWg\Url::withPort() - success - adding a new one for a special URL
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_special2.phpt b/ext/uri/tests/whatwg/modification/port_success_special2.phpt
index 7570768cd27..f8640ce8a94 100644
--- a/ext/uri/tests/whatwg/modification/port_success_special2.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_special2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - adding a new one for a special URL
+Test Uri\WhatWg\Url::withPort() - success - adding a new one for a special URL
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
index 2aa7f3c07cf..788a610e2e8 100644
--- a/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - unsetting existing
+Test Uri\WhatWg\Url::withPort() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt b/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt
index 07ea45d9d8e..55f4dc90295 100644
--- a/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - unsetting non-existent
+Test Uri\WhatWg\Url::withPort() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
index 88c164039a5..1423ab4c54a 100644
--- a/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - characters from the percent encode set
+Test Uri\WhatWg\Url::withQuery() - success - characters from the percent-encode set
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt b/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt
index 95a857d0f4d..0201105d7c9 100644
--- a/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - context-sensitive reserved character
+Test Uri\WhatWg\Url::withQuery() - success - context-sensitive reserved character
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_empty.phpt b/ext/uri/tests/whatwg/modification/query_success_empty.phpt
index f8b94f43529..ee7f50be4ed 100644
--- a/ext/uri/tests/whatwg/modification/query_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - empty string
+Test Uri\WhatWg\Url::withQuery() - success - empty string
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_encoded.phpt b/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
index ef319c04708..f74399ed813 100644
--- a/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - URL encoded characters
+Test Uri\WhatWg\Url::withQuery() - success - percent-encoded characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_existing.phpt b/ext/uri/tests/whatwg/modification/query_success_existing.phpt
index 317c4fa4687..eda22cc4b0c 100644
--- a/ext/uri/tests/whatwg/modification/query_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - changing an existing one
+Test Uri\WhatWg\Url::withQuery() - success - changing an existing one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
index 873e17d787f..80a151ae246 100644
--- a/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - null byte
+Test Uri\WhatWg\Url::withQuery() - success - null byte
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt b/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
index a993ca28b94..165b49244f3 100644
--- a/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - only a question mark character
+Test Uri\WhatWg\Url::withQuery() - success - only a question mark character
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_unicode.phpt b/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
index f30a49b868c..582e7148f1a 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - unicode characters
+Test Uri\WhatWg\Url::withQuery() - success - Unicode characters
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
index e898da5a39a..5224c7f091e 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - unsetting existing
+Test Uri\WhatWg\Url::withQuery() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt b/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt
index 1be34723655..10524914db3 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - unsetting not-existent
+Test Uri\WhatWg\Url::withQuery() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt b/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt
index d43e5e22dbb..40f8b64423d 100644
--- a/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - with leading question mark
+Test Uri\WhatWg\Url::withQuery() - success - with leading question mark
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt b/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
index 0113d4ff836..5670d594791 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - empty string
+Test Uri\WhatWg\Url::withScheme() - error - empty string
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->withScheme("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt b/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
index 906a99585ad..1567f047222 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - URL encoded characters
+Test Uri\WhatWg\Url::withScheme() - error - percent-encoded characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->withScheme("http%73");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt b/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
index 90256bbab1c..278f579aeed 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - invalid characters
+Test Uri\WhatWg\Url::withScheme() - error - invalid characters
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->withScheme("http?");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt b/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
index 649d318b897..9b98fa9bfbf 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - null byte
+Test Uri\WhatWg\Url::withScheme() - error - null byte
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->withScheme("sch\0me");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt b/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
index 838769ec30f..df4413ef635 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - basic case
+Test Uri\WhatWg\Url::withScheme() - success - basic case
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt b/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
index 88432552274..e7d265e3d8a 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - trailing colon
+Test Uri\WhatWg\Url::withScheme() - success - trailing colon
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/scheme_success_full.phpt b/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
index 103c77e1eb7..e61e4759caa 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - trailing colon and double slash
+Test Uri\WhatWg\Url::withScheme() - success - trailing colon and double slash
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
index 9763c9c5194..c2369fe1e7a 100644
--- a/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - characters from the percent encode set
+Test Uri\WhatWg\Url::withUsername() - success - characters from the percent-encode set
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt b/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt
index 13357d269b4..91f37ebc962 100644
--- a/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - empty host
+Test Uri\WhatWg\Url::withUsername() - success - empty host
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_encoded.phpt b/ext/uri/tests/whatwg/modification/username_success_encoded.phpt
index 1415261e1ed..439d3212e3a 100644
--- a/ext/uri/tests/whatwg/modification/username_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - percent-encoded octet byte
+Test Uri\WhatWg\Url::withUsername() - success - percent-encoded octet byte
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_existing.phpt b/ext/uri/tests/whatwg/modification/username_success_existing.phpt
index a0a1e5ffad9..bfc3b4a414e 100644
--- a/ext/uri/tests/whatwg/modification/username_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - changing existing
+Test Uri\WhatWg\Url::withUsername() - success - changing existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt b/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt
index 3a6a0bf858e..e4ca78e8066 100644
--- a/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - file scheme
+Test Uri\WhatWg\Url::withUsername() - success - file scheme
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_new.phpt b/ext/uri/tests/whatwg/modification/username_success_new.phpt
index f8672916ad5..45887c19476 100644
--- a/ext/uri/tests/whatwg/modification/username_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - adding a new one
+Test Uri\WhatWg\Url::withUsername() - success - adding a new one
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
index 7428dfe9602..e7520a50b42 100644
--- a/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - null byte
+Test Uri\WhatWg\Url::withUsername() - success - null byte
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
index 59d3a42a1fd..990d3f67ece 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting existing
+Test Uri\WhatWg\Url::withUsername() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
index 2e6ba48a1dd..36ab106ee14 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting existing
+Test Uri\WhatWg\Url::withUsername() - success - unsetting existing
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt
index b462100a7e2..5a71581b0ca 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting non-existent
+Test Uri\WhatWg\Url::withUsername() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt
index 938202b5c7d..1394e982b8e 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting non-existent
+Test Uri\WhatWg\Url::withUsername() - success - unsetting non-existent
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_reference_returns_null.phpt b/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
similarity index 94%
rename from ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_reference_returns_null.phpt
rename to ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
index 888f289a38a..aeb4275fbd7 100644
--- a/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_reference_returns_null.phpt
+++ b/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - basic - parse() returns null for an emoji relative reference
+Test Uri\WhatWg\Url parsing - basic - parse() returns null for an emoji relative-URL
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt b/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
index 2b7114baa73..8375e16a928 100644
--- a/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
+++ b/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt b/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt
index 8444ee9e3e9..fc6a4335c0f 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("https://ex[a]mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt
index 92b317078eb..acc4f30696a 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("https://");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt
index 726241674fa..2a16305f9eb 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("https://user:pass@");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt
index 90f2738148f..f3f8458e864 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("/");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt b/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt
index 959aa0c4442..9595a6bce61 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("https://[v7.host]");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt b/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt
index f450d26c416..d65d623ffb0 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - basic - URL contains null byte
+Test Uri\WhatWg\Url parsing - host - null byte
 --FILE--
 <?php

 try {
     new Uri\WhatWg\Url("https://exam\0ple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt b/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt
index 25a28a9750c..4129fa5d20b 100644
--- a/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("///");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt b/ext/uri/tests/whatwg/parsing/path_error_relative_url.phpt
similarity index 64%
rename from ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt
rename to ext/uri/tests/whatwg/parsing/path_error_relative_url.phpt
index 8e6c6fd3842..b61cecb9341 100644
--- a/ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt
+++ b/ext/uri/tests/whatwg/parsing/path_error_relative_url.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - path - relative reference
+Test Uri\WhatWg\Url parsing - path - relative-URL
 --FILE--
 <?php

 try {
     new Uri\WhatWg\Url("foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_absolute.phpt b/ext/uri/tests/whatwg/parsing/path_error_relative_url_absolute.phpt
similarity index 64%
rename from ext/uri/tests/whatwg/parsing/path_error_relative_reference_absolute.phpt
rename to ext/uri/tests/whatwg/parsing/path_error_relative_url_absolute.phpt
index 01d549210d9..1f40dfb945f 100644
--- a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_absolute.phpt
+++ b/ext/uri/tests/whatwg/parsing/path_error_relative_url_absolute.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - path - relative reference
+Test Uri\WhatWg\Url parsing - path - relative-URL
 --FILE--
 <?php

 try {
     new Uri\WhatWg\Url("/foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
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_url_only_query_fragment.phpt
similarity index 65%
rename from ext/uri/tests/whatwg/parsing/path_error_relative_reference_only_query_fragment.phpt
rename to ext/uri/tests/whatwg/parsing/path_error_relative_url_only_query_fragment.phpt
index 9c6a7a7906b..b0994261d25 100644
--- a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_only_query_fragment.phpt
+++ b/ext/uri/tests/whatwg/parsing/path_error_relative_url_only_query_fragment.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - path - relative reference
+Test Uri\WhatWg\Url parsing - path - relative-URL
 --FILE--
 <?php

 try {
     new Uri\WhatWg\Url("?query#fragment");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt b/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
index 8175f2ca992..886ed4f265e 100644
--- a/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("https://example.com:Ȏ");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/port_error_negative.phpt b/ext/uri/tests/whatwg/parsing/port_error_negative.phpt
index bb23476db57..44557c20635 100644
--- a/ext/uri/tests/whatwg/parsing/port_error_negative.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_negative.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("http://example.com:-1");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt
index 874211ccb1c..ee22ec0caa4 100644
--- a/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - port - percent encoded character
+Test Uri\WhatWg\Url parsing - port - percent-encoded character
 --FILE--
 <?php

 try {
     new Uri\WhatWg\Url("https://example.com:%30");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
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
index f0f79670230..f20bef470d5 100644
--- 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
@@ -6,7 +6,7 @@
 try {
     var_dump(new Uri\WhatWg\Url("https://example.com:8080@username:password"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
index 023c1d3fab9..f5f39669558 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt
index 9c69b08161e..7b16223f2d2 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("http&://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
index 517bbb41059..d814c849b9b 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("ƕŢŢƤƨ://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt
index 5674c1f3309..13428f0e6b6 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("ht\0tp://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt
index 92832f65a01..2caf11fab36 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("http:");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt
index 22ab6fc5351..fa21e6d2490 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("http:/");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt
index a0324edd370..ff857b3c972 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - scheme - percent encoded character
+Test Uri\WhatWg\Url parsing - scheme - percent-encoded character
 --FILE--
 <?php

 try {
     new Uri\WhatWg\Url("http%2F://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt
index 9966ad6248e..5196c92c262 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt
@@ -6,7 +6,7 @@
 try {
     new Uri\WhatWg\Url("hÁttp://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_with_base.phpt b/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
similarity index 86%
rename from ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_with_base.phpt
rename to ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
index 0c293c6ba54..994a05cdc2b 100644
--- a/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_with_base.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - parse() - absolute URL with base URL
+Test Uri\WhatWg\Url::parse() - success - absolute URL with base URL
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_with_base.phpt b/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
similarity index 84%
rename from ext/uri/tests/whatwg/reference_resolution/parse_success_relative_with_base.phpt
rename to ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
index e6b24b7beab..b24a335f036 100644
--- a/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_with_base.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - parse() - relative reference with base URL
+Test Uri\WhatWg\Url::parse() - success - relative-URL with base URL
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt
index 15b2a141f2f..ede2c670511 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - null byte
+Test Uri\WhatWg\Url::resolve() - error - null byte in host
 --FILE--
 <?php

@@ -8,7 +8,7 @@
 try {
     $url->resolve("https://ex\0mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }

 ?>
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt
index fdcd96ef0b8..6213f32417d 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - IPv4 with too many parts
+Test Uri\WhatWg\Url::resolve() - error - IPv4 with too many parts
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt
index 042b082cda0..e1ed1cc5f27 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - absolute URL
+Test Uri\WhatWg\Url::resolve() - success - absolute URL
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warnings.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
similarity index 90%
rename from ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warnings.phpt
rename to ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
index 49713f5e838..e2660e1db0a 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warnings.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - invalid URL unit warning
+Test Uri\WhatWg\Url::resolve() - success - invalid URL unit warning
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt
index f26b2eb5fa5..0d7e41a699c 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - null byte in path
+Test Uri\WhatWg\Url::resolve() - success - null byte in path
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_reference.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
similarity index 87%
rename from ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_reference.phpt
rename to ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
index 3d9fff39692..306f54ad3d9 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_reference.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - relative reference
+Test Uri\WhatWg\Url::resolve() - success - relative-URL
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/serialization/basic_success.phpt b/ext/uri/tests/whatwg/serialization/basic_success.phpt
index b5b22479719..2c31521bc32 100644
--- a/ext/uri/tests/whatwg/serialization/basic_success.phpt
+++ b/ext/uri/tests/whatwg/serialization/basic_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url serialization and unserialization
+Test Uri\WhatWg\Url serialization and unserialization - success
 --FILE--
 <?php

diff --git a/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt b/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
index 6de1d9d1756..5cb3b14a766 100644
--- a/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
+++ b/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GH-22046: Uri\WhatWg\Url cannot be unserialized with the unsupported C format
+Test Uri\WhatWg\Url unserialize() - error - unsupported C format
 --FILE--
 <?php

diff --git a/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt b/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
index 659eabde89a..7ca93e2d579 100644
--- a/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
+++ b/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test zend_test_uri_parser() with an invalid Uri\WhatWg\Url
+Test zend_test_uri_parser() - error - invalid Uri\WhatWg\Url
 --EXTENSIONS--
 zend_test
 --FILE--
diff --git a/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt b/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
index 1ad726123b7..52c5eca1eb2 100644
--- a/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
+++ b/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test the parse_url-based URI parser
+Test zend_test_uri_parser() - success - parse_url-based parser
 --EXTENSIONS--
 zend_test
 --FILE--
diff --git a/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt b/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
index 7eec9984dc7..1edbaa32fc3 100644
--- a/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
+++ b/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test the handling of large ports for the uri struct
+Test zend_test_uri_parser() - success - large RFC 3986 port
 --EXTENSIONS--
 zend_test
 --FILE--