ext/uri: Consistency follow up to #23286

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 @@ $builder = new Uri\Rfc3986\UriBuilder()
 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";
 }
 
 ?>

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
 

ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setFragment("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setFragment("főő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setHost("ex%3mple.co");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

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 @@ $builder = new Uri\Rfc3986\UriBuilder();
 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";
 }
 
 ?>

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
 

ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt

@@ -9,7 +9,7 @@ $builder->setPath("fo:o/bar/baz");
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt

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

ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt

@@ -10,7 +10,7 @@ $builder->setHost("example.com");
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/path_error_special_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setPath("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt

@@ -9,7 +9,7 @@ $builder->setPort(443);
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/port_error_negative.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setPort(-1);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/query_error_special_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setQuery("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setQuery("főő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setScheme("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setScheme("1");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setScheme(":");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt

@@ -9,7 +9,7 @@ $builder->setUserInfo("user:pass");
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setUserInfo("%3");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt

@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setUserInfo("<>");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

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
 

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
 

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
 

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

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
 

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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withFragment("#fragment");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withFragment("ő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

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
 

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
 

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
 

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
 

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
 

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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withHost("ex#mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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