diff --git a/Zend/tests/partial_application/attributes_004.phpt b/Zend/tests/partial_application/attributes_004.phpt
new file mode 100644
index 000000000000..15e62b96df67
--- /dev/null
+++ b/Zend/tests/partial_application/attributes_004.phpt
@@ -0,0 +1,60 @@
+--TEST--
+PFA attribute UAF
+--CREDITS--
+Ryan @ Calif.io
+--FILE--
+<?php
+
+/* Reproduces with opcache.enable_cli=0. Not adding this to the INI section so
+ * that it's tested in all configurations. */
+
+#[NoDiscard(ND_MESSAGE)]
+function userTarget(mixed $value): mixed
+{
+    return $value;
+}
+
+define('ND_MESSAGE', str_repeat('message-', 32).time());
+
+function arguments(ReflectionFunction $function): array
+{
+    return $function->getAttributes(NoDiscard::class)[0]->getArguments();
+}
+
+$original = new ReflectionFunction('userTarget');
+var_dump(arguments($original));
+
+$partial = userTarget(?);
+echo "partial-created\n";
+var_dump(arguments($original));
+var_dump(arguments(new ReflectionFunction($partial)));
+
+unset($partial);
+gc_collect_cycles();
+echo "partial-destroyed\n";
+var_dump(arguments($original));
+
+userTarget('discarded');
+
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
+}
+partial-created
+array(1) {
+  [0]=>
+  string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
+}
+array(1) {
+  [0]=>
+  string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
+}
+partial-destroyed
+array(1) {
+  [0]=>
+  string(266) "message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d"
+}
+
+Warning: The return value of function userTarget() should either be used or intentionally ignored by casting it as (void), message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-message-%d in %s on line %d
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 97cd2f895d3c..f6c0a1ad0e98 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -326,10 +326,11 @@ struct _zend_mm_chunk {
 	zend_mm_heap      *heap;
 	zend_mm_chunk     *next;
 	zend_mm_chunk     *prev;
+	zend_mm_chunk     *next_shadow;             /* shadow of "next" while the chunk is cached */
 	uint32_t           free_pages;				/* number of free pages */
 	uint32_t           free_tail;               /* number of free pages at the end of chunk */
 	uint32_t           num;
-	char               reserve[64 - (sizeof(void*) * 3 + sizeof(uint32_t) * 3)];
+	char               reserve[64 - (sizeof(void*) * 4 + sizeof(uint32_t) * 3)];
 	zend_mm_heap       heap_slot;               /* used only in main chunk */
 	zend_mm_page_map   free_map;                /* 512 bits or 64 bytes */
 	zend_mm_page_info  map[ZEND_MM_PAGES];      /* 2 KB = 512 * 4 */
@@ -883,6 +884,64 @@ static zend_always_inline void zend_mm_chunk_init(zend_mm_heap *heap, zend_mm_ch
 	chunk->map[0] = ZEND_MM_LRUN(ZEND_MM_FIRST_PAGE);
 }
 
+/* Cached chunks are linked through their headers, which live in memory a heap
+ * overflow can reach, so the link is mirrored in an encoded shadow. The shadow
+ * is byte-swapped, so that small overwrites hit the most significant bytes of
+ * the address, XOR'ed with the heap key, and XOR'ed with its own address so
+ * that a valid (link, shadow) pair cannot be replayed into another chunk. */
+static zend_always_inline zend_mm_chunk *zend_mm_encode_cached_chunk(const zend_mm_heap *heap, const void *holder, const zend_mm_chunk *next)
+{
+#ifdef WORDS_BIGENDIAN
+	return (zend_mm_chunk*)((uintptr_t)next ^ heap->shadow_key ^ (uintptr_t)holder);
+#else
+	return (zend_mm_chunk*)(BSWAPPTR((uintptr_t)next) ^ heap->shadow_key ^ (uintptr_t)holder);
+#endif
+}
+
+static zend_always_inline zend_mm_chunk *zend_mm_decode_cached_chunk_key(uintptr_t key, const void *holder, const zend_mm_chunk *encoded)
+{
+#ifdef WORDS_BIGENDIAN
+	zend_mm_chunk *next = (zend_mm_chunk*)((uintptr_t)encoded ^ key ^ (uintptr_t)holder);
+#else
+	zend_mm_chunk *next = (zend_mm_chunk*)(BSWAPPTR((uintptr_t)encoded ^ key ^ (uintptr_t)holder));
+#endif
+
+	ZEND_MM_CHECK(ZEND_MM_ALIGNED_OFFSET(next, ZEND_MM_CHUNK_SIZE) == 0, "zend_mm_heap corrupted");
+	return next;
+}
+
+static zend_always_inline void zend_mm_set_next_cached_chunk(zend_mm_heap *heap, zend_mm_chunk *chunk, zend_mm_chunk *next)
+{
+	chunk->next = next;
+	chunk->next_shadow = zend_mm_encode_cached_chunk(heap, &chunk->next_shadow, next);
+}
+
+static zend_always_inline zend_mm_chunk *zend_mm_get_next_cached_chunk_key(uintptr_t key, const zend_mm_chunk *chunk)
+{
+	zend_mm_chunk *next = zend_mm_decode_cached_chunk_key(key, &chunk->next_shadow, chunk->next_shadow);
+
+	ZEND_MM_CHECK(chunk->next == next, "zend_mm_heap corrupted");
+	return next;
+}
+
+static zend_always_inline zend_mm_chunk *zend_mm_get_next_cached_chunk(const zend_mm_heap *heap, const zend_mm_chunk *chunk)
+{
+	return zend_mm_get_next_cached_chunk_key(heap->shadow_key, chunk);
+}
+
+/* Re-encode the cached links after the heap key changed. */
+static zend_always_inline void zend_mm_rekey_cached_chunks(zend_mm_heap *heap, uintptr_t old_key)
+{
+	zend_mm_chunk *chunk = heap->cached_chunks;
+
+	while (chunk != NULL) {
+		zend_mm_chunk *next = zend_mm_get_next_cached_chunk_key(old_key, chunk);
+
+		zend_mm_set_next_cached_chunk(heap, chunk, next);
+		chunk = next;
+	}
+}
+
 /***********************/
 /* Huge Runs (forward) */
 /***********************/
@@ -1031,7 +1090,9 @@ static void *zend_mm_alloc_pages(zend_mm_heap *heap, uint32_t pages_count ZEND_F
 			if (heap->cached_chunks) {
 				heap->cached_chunks_count--;
 				chunk = heap->cached_chunks;
-				heap->cached_chunks = chunk->next;
+				/* The list head lives in the heap, which is as reachable as the chunk headers. */
+				ZEND_MM_CHECK(ZEND_MM_ALIGNED_OFFSET(chunk, ZEND_MM_CHUNK_SIZE) == 0, "zend_mm_heap corrupted");
+				heap->cached_chunks = zend_mm_get_next_cached_chunk(heap, chunk);
 			} else {
 #if ZEND_MM_LIMIT
 				if (UNEXPECTED(ZEND_MM_CHUNK_SIZE > heap->limit - heap->real_size)) {
@@ -1150,7 +1211,7 @@ static zend_always_inline void zend_mm_delete_chunk(zend_mm_heap *heap, zend_mm_
 	  && heap->last_chunks_delete_count >= 4)) {
 		/* delay deletion */
 		heap->cached_chunks_count++;
-		chunk->next = heap->cached_chunks;
+		zend_mm_set_next_cached_chunk(heap, chunk, heap->cached_chunks);
 		heap->cached_chunks = chunk;
 	} else {
 #if ZEND_MM_STAT || ZEND_MM_LIMIT
@@ -1168,7 +1229,7 @@ static zend_always_inline void zend_mm_delete_chunk(zend_mm_heap *heap, zend_mm_
 			zend_mm_chunk_free(heap, chunk, ZEND_MM_CHUNK_SIZE);
 		} else {
 //TODO: select the best chunk to delete???
-			chunk->next = heap->cached_chunks->next;
+			zend_mm_set_next_cached_chunk(heap, chunk, zend_mm_get_next_cached_chunk(heap, heap->cached_chunks));
 			zend_mm_chunk_free(heap, heap->cached_chunks, ZEND_MM_CHUNK_SIZE);
 			heap->cached_chunks = chunk;
 		}
@@ -1276,35 +1337,38 @@ static zend_always_inline int zend_mm_small_size_to_bin(size_t size)
  * before dereference by comparing them with a shadow.
  *
  * The shadow is a copy of the pointer, stored at the end of the slot. It is
- * XOR'ed with a random key, and converted to big-endian so that smaller
- * corruptions affect the most significant bytes, which has a high chance of
- * resulting in an invalid address instead of pointing to an adjacent slot.
+ * XOR'ed with a random key and with its own address, and converted to
+ * big-endian so that smaller corruptions affect the most significant bytes,
+ * which has a high chance of resulting in an invalid address instead of
+ * pointing to an adjacent slot. Mixing in the holder address keeps the key from
+ * being stored verbatim when the encoded pointer is NULL, and prevents a valid
+ * shadow from being naïvely replayed into another slot.
  */
 
-#define ZEND_MM_FREE_SLOT_PTR_SHADOW(free_slot, bin_num) \
-	*((zend_mm_free_slot**)((char*)(free_slot) + bin_data_size[(bin_num)] - sizeof(zend_mm_free_slot*)))
+#define ZEND_MM_FREE_SLOT_PTR_SHADOW_ADDR(free_slot, bin_num) \
+	((zend_mm_free_slot**)((char*)(free_slot) + bin_data_size[(bin_num)] - sizeof(zend_mm_free_slot*)))
 
-static zend_always_inline zend_mm_free_slot* zend_mm_encode_free_slot(const zend_mm_heap *heap, const zend_mm_free_slot *slot)
+static zend_always_inline zend_mm_free_slot* zend_mm_encode_free_slot(const zend_mm_heap *heap, const void *holder, const zend_mm_free_slot *next)
 {
 #ifdef WORDS_BIGENDIAN
-	return (zend_mm_free_slot*)(((uintptr_t)slot) ^ heap->shadow_key);
+	return (zend_mm_free_slot*)((uintptr_t)next ^ heap->shadow_key ^ (uintptr_t)holder);
 #else
-	return (zend_mm_free_slot*)(BSWAPPTR((uintptr_t)slot) ^ heap->shadow_key);
+	return (zend_mm_free_slot*)(BSWAPPTR((uintptr_t)next) ^ heap->shadow_key ^ (uintptr_t)holder);
 #endif
 }
 
-static zend_always_inline zend_mm_free_slot* zend_mm_decode_free_slot_key(uintptr_t shadow_key, zend_mm_free_slot *slot)
+static zend_always_inline zend_mm_free_slot* zend_mm_decode_free_slot_key(uintptr_t shadow_key, const void *holder, zend_mm_free_slot *shadow)
 {
 #ifdef WORDS_BIGENDIAN
-	return (zend_mm_free_slot*)((uintptr_t)slot ^ shadow_key);
+	return (zend_mm_free_slot*)((uintptr_t)shadow ^ shadow_key ^ (uintptr_t)holder);
 #else
-	return (zend_mm_free_slot*)(BSWAPPTR((uintptr_t)slot ^ shadow_key));
+	return (zend_mm_free_slot*)(BSWAPPTR((uintptr_t)shadow ^ shadow_key ^ (uintptr_t)holder));
 #endif
 }
 
-static zend_always_inline zend_mm_free_slot* zend_mm_decode_free_slot(zend_mm_heap *heap, zend_mm_free_slot *slot)
+static zend_always_inline zend_mm_free_slot* zend_mm_decode_free_slot(zend_mm_heap *heap, const void *holder, zend_mm_free_slot *shadow)
 {
-	return zend_mm_decode_free_slot_key(heap->shadow_key, slot);
+	return zend_mm_decode_free_slot_key(heap->shadow_key, holder, shadow);
 }
 
 static zend_always_inline void zend_mm_set_next_free_slot(zend_mm_heap *heap, uint32_t bin_num, zend_mm_free_slot *slot, zend_mm_free_slot *next)
@@ -1312,15 +1376,17 @@ static zend_always_inline void zend_mm_set_next_free_slot(zend_mm_heap *heap, ui
 	ZEND_ASSERT(bin_data_size[bin_num] >= ZEND_MM_MIN_USEABLE_BIN_SIZE);
 
 	slot->next_free_slot = next;
-	ZEND_MM_FREE_SLOT_PTR_SHADOW(slot, bin_num) = zend_mm_encode_free_slot(heap, next);
+
+	zend_mm_free_slot **shadow_addr = ZEND_MM_FREE_SLOT_PTR_SHADOW_ADDR(slot, bin_num);
+	*shadow_addr = zend_mm_encode_free_slot(heap, shadow_addr, next);
 }
 
 static zend_always_inline zend_mm_free_slot *zend_mm_get_next_free_slot(zend_mm_heap *heap, uint32_t bin_num, zend_mm_free_slot* slot)
 {
 	zend_mm_free_slot *next = slot->next_free_slot;
 	if (EXPECTED(next != NULL)) {
-		zend_mm_free_slot *shadow = ZEND_MM_FREE_SLOT_PTR_SHADOW(slot, bin_num);
-		if (UNEXPECTED(next != zend_mm_decode_free_slot(heap, shadow))) {
+		zend_mm_free_slot **shadow_addr = ZEND_MM_FREE_SLOT_PTR_SHADOW_ADDR(slot, bin_num);
+		if (UNEXPECTED(next != zend_mm_decode_free_slot(heap, shadow_addr, *shadow_addr))) {
 			zend_mm_panic("zend_mm_heap corrupted");
 		}
 	}
@@ -2054,8 +2120,8 @@ ZEND_API void zend_mm_refresh_key_child(zend_mm_heap *heap)
 		}
 		zend_mm_free_slot *next;
 		while ((next = slot->next_free_slot)) {
-			zend_mm_free_slot *shadow = ZEND_MM_FREE_SLOT_PTR_SHADOW(slot, i);
-			if (UNEXPECTED(next != zend_mm_decode_free_slot_key(old_key, shadow))) {
+			zend_mm_free_slot **shadow_addr = ZEND_MM_FREE_SLOT_PTR_SHADOW_ADDR(slot, i);
+			if (UNEXPECTED(next != zend_mm_decode_free_slot_key(old_key, shadow_addr, *shadow_addr))) {
 				zend_mm_panic("zend_mm_heap corrupted");
 			}
 			zend_mm_set_next_free_slot(heap, i, slot, next);
@@ -2063,6 +2129,8 @@ ZEND_API void zend_mm_refresh_key_child(zend_mm_heap *heap)
 		}
 	}
 
+	zend_mm_rekey_cached_chunks(heap, old_key);
+
 #if ZEND_DEBUG
 	heap->pid = getpid();
 #endif
@@ -2516,7 +2584,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
 	p = heap->main_chunk->next;
 	while (p != heap->main_chunk) {
 		zend_mm_chunk *q = p->next;
-		p->next = heap->cached_chunks;
+		zend_mm_set_next_cached_chunk(heap, p, heap->cached_chunks);
 		heap->cached_chunks = p;
 		p = q;
 		heap->chunks_count--;
@@ -2527,7 +2595,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
 		/* free all cached chunks */
 		while (heap->cached_chunks) {
 			p = heap->cached_chunks;
-			heap->cached_chunks = p->next;
+			heap->cached_chunks = zend_mm_get_next_cached_chunk(heap, p);
 			zend_mm_chunk_free(heap, p, ZEND_MM_CHUNK_SIZE);
 		}
 		/* free the first chunk */
@@ -2538,16 +2606,16 @@ ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
 		while ((double)heap->cached_chunks_count + 0.9 > heap->avg_chunks_count &&
 		       heap->cached_chunks) {
 			p = heap->cached_chunks;
-			heap->cached_chunks = p->next;
+			heap->cached_chunks = zend_mm_get_next_cached_chunk(heap, p);
 			zend_mm_chunk_free(heap, p, ZEND_MM_CHUNK_SIZE);
 			heap->cached_chunks_count--;
 		}
 		/* clear cached chunks */
 		p = heap->cached_chunks;
 		while (p != NULL) {
-			zend_mm_chunk *q = p->next;
+			zend_mm_chunk *q = zend_mm_get_next_cached_chunk(heap, p);
 			memset(p, 0, sizeof(zend_mm_chunk));
-			p->next = q;
+			zend_mm_set_next_cached_chunk(heap, p, q);
 			p = q;
 		}
 
@@ -2584,7 +2652,12 @@ ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
 				&& "heap was re-used without calling zend_mm_refresh_key_child() after a fork");
 #endif
 
+		uintptr_t old_key = heap->shadow_key;
+
 		zend_mm_refresh_key(heap);
+
+		/* Cached chunks outlive the request, so re-encode their links */
+		zend_mm_rekey_cached_chunks(heap, old_key);
 	}
 }
 
@@ -2931,7 +3004,7 @@ ZEND_API zend_result zend_set_memory_limit(size_t memory_limit)
 			/* free some cached chunks to fit into new memory limit */
 			do {
 				zend_mm_chunk *p = heap->cached_chunks;
-				heap->cached_chunks = p->next;
+				heap->cached_chunks = zend_mm_get_next_cached_chunk(heap, p);
 				zend_mm_chunk_free(heap, p, ZEND_MM_CHUNK_SIZE);
 				heap->cached_chunks_count--;
 				heap->real_size -= ZEND_MM_CHUNK_SIZE;
diff --git a/Zend/zend_partial.c b/Zend/zend_partial.c
index de243bd7e65f..a4cc4a4ce571 100644
--- a/Zend/zend_partial.c
+++ b/Zend/zend_partial.c
@@ -472,7 +472,9 @@ static zend_ast *zp_attribute_to_ast(zend_attribute *attribute)
 	if (attribute->argc) {
 		args_ast = zend_ast_create_arg_list(0, ZEND_AST_ARG_LIST);
 		for (uint32_t i = 0; i < attribute->argc; i++) {
-			zend_ast *arg_ast = zend_ast_create_zval(&attribute->args[i].value);
+			zval *zv = &attribute->args[i].value;
+			Z_TRY_ADDREF_P(zv);
+			zend_ast *arg_ast = zend_ast_create_zval(zv);
 			if (attribute->args[i].name) {
 				arg_ast = zend_ast_create(ZEND_AST_NAMED_ARG,
 						zend_ast_create_zval_from_str(
@@ -561,6 +563,7 @@ static zend_ast *zp_compile_forwarding_call(
 			args_ast = zend_ast_list_add(args_ast, default_value_ast);
 		} else if (zp_is_const_arg(const_args, offset)) {
 			ZEND_ASSERT(Z_TYPE(argv[offset]) < IS_OBJECT);
+			ZEND_ASSERT(!Z_REFCOUNTED(argv[offset]));
 
 			/* This argument never changes, so we can burn it into the op_array
 			 * and check its type ahead of time. */
diff --git a/ext/opcache/shared_alloc_mmap.c b/ext/opcache/shared_alloc_mmap.c
index a805912d0d75..4825da3e4c01 100644
--- a/ext/opcache/shared_alloc_mmap.c
+++ b/ext/opcache/shared_alloc_mmap.c
@@ -243,9 +243,9 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
 		/* to got HUGE PAGES in low 32-bit address we have to reserve address
 		   space and then remap it using MAP_HUGETLB */
 
-		p = mmap(NULL, requested_size, flags, MAP_SHARED|MAP_ANONYMOUS|MAP_32BIT, fd, 0);
+		p = mmap(NULL, requested_size + huge_page_size, flags, MAP_SHARED|MAP_ANONYMOUS|MAP_32BIT, fd, 0);
 		if (p != MAP_FAILED) {
-			munmap(p, requested_size);
+			munmap(p, requested_size + huge_page_size);
 			p = (void*)(ZEND_MM_ALIGNED_SIZE_EX((ptrdiff_t)p, huge_page_size));
 			p = mmap(p, requested_size, flags, MAP_SHARED|MAP_ANONYMOUS|MAP_32BIT|MAP_HUGETLB|MAP_FIXED, -1, 0);
 			if (p != MAP_FAILED) {
diff --git a/ext/openssl/tests/ServerClientTestCase.inc b/ext/openssl/tests/ServerClientTestCase.inc
index b7e866954fcf..0c3c49db7259 100644
--- a/ext/openssl/tests/ServerClientTestCase.inc
+++ b/ext/openssl/tests/ServerClientTestCase.inc
@@ -24,7 +24,7 @@ function phpt_has_sslv3() {
     if (!is_null($result)) {
         return $result;
     }
-    $server = @stream_socket_server('sslv3://127.0.0.1:10013');
+    $server = @stream_socket_server('sslv3://127.0.0.1:0');
     if ($result = !!$server) {
         fclose($server);
     }
diff --git a/ext/openssl/tests/gh20802.phpt b/ext/openssl/tests/gh20802.phpt
index 786679c41c6a..e078f461fc44 100644
--- a/ext/openssl/tests/gh20802.phpt
+++ b/ext/openssl/tests/gh20802.phpt
@@ -26,7 +26,7 @@ $serverCode = <<<'CODE'
 		    ]
 	    ]
     ]);
-    $server = stream_socket_server('tls://127.0.0.1:12443', $errno, $errstr, $flags, $ctx);
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
     phpt_notify_server_start($server);
     stream_socket_accept($server, 3);
 CODE;
@@ -42,7 +42,7 @@ $ctx = stream_context_create([
 	    'verify_peer'  => false
 	]
     ]);
-    @stream_socket_client("tls://127.0.0.1:12443", $errno, $errstr, 1, $flags, $ctx);
+    @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
 CODE;
 
 include 'CertificateGenerator.inc';
diff --git a/ext/openssl/tests/openssl_error_string_basic_openssl3.phpt b/ext/openssl/tests/openssl_error_string_basic_openssl3.phpt
index 093681cb2e10..d36fcac194e0 100644
--- a/ext/openssl/tests/openssl_error_string_basic_openssl3.phpt
+++ b/ext/openssl/tests/openssl_error_string_basic_openssl3.phpt
@@ -53,7 +53,7 @@ function dump_openssl_errors($name) {
 }
 
 // common output file
-$output_file =  __DIR__ . "/openssl_error_string_basic_output.tmp";
+$output_file =  __DIR__ . "/openssl_error_string_basic_openssl3_output.tmp";
 // invalid file for read is something that does not exist in current directory
 $invalid_file_for_read = __DIR__ . "/invalid_file_for_read_operation.txt";
 // invalid file for is the test dir as writing file to existing dir should always fail
@@ -156,7 +156,7 @@ expect_openssl_errors('openssl_csr_get_subjec pem', [$err_pem_no_start_line]);
 ?>
 --CLEAN--
 <?php
-$output_file =  __DIR__ . "/openssl_error_string_basic_output.tmp";
+$output_file =  __DIR__ . "/openssl_error_string_basic_openssl3_output.tmp";
 if (is_file($output_file)) {
     unlink($output_file);
 }
diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
index f53e9753613e..0938921a8ff5 100644
--- a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
@@ -4,7 +4,7 @@ openssl_pkcs12_export_to_file() tests
 openssl
 --FILE--
 <?php
-$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
+$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_basic__pkcsfile.tmp";
 
 $cert_file = __DIR__ . "/public.crt";
 $cert = file_get_contents($cert_file);
@@ -38,7 +38,7 @@ try {
 ?>
 --CLEAN--
 <?php
-$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
+$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_basic__pkcsfile.tmp";
 if (file_exists($pkcsfile)) {
     unlink($pkcsfile);
 }
diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt
index d98f6d15fef1..fab11c672f22 100644
--- a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt
+++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt
@@ -4,7 +4,7 @@ openssl_pkcs12_export_to_file() error tests
 openssl
 --FILE--
 <?php
-$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
+$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_error__pkcsfile.tmp";
 
 $cert_file = __DIR__ . "/public.crt";
 $cert = file_get_contents($cert_file);
@@ -21,7 +21,7 @@ var_dump(openssl_pkcs12_export_to_file($cert, '.', $priv, $pass));
 ?>
 --CLEAN--
 <?php
-$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
+$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_error__pkcsfile.tmp";
 if (file_exists($pkcsfile)) {
     unlink($pkcsfile);
 }
diff --git a/ext/openssl/tests/session_resumption_import_export_session.phpt b/ext/openssl/tests/session_resumption_import_export_session.phpt
index 0d9a3274b113..9c1f40fc88bf 100644
--- a/ext/openssl/tests/session_resumption_import_export_session.phpt
+++ b/ext/openssl/tests/session_resumption_import_export_session.phpt
@@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
 --FILE--
 <?php
-$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp';
+$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_import_export.pem.tmp';
 
 $serverCode = <<<'CODE'
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
@@ -76,7 +76,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp');
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_import_export.pem.tmp');
 ?>
 --EXPECTF--
 string(%d) "-----BEGIN SSL SESSION PARAMETERS-----
diff --git a/ext/openssl/tests/session_resumption_invalid_session_import.phpt b/ext/openssl/tests/session_resumption_invalid_session_import.phpt
index a9c5b65f2051..efd49e7c693b 100644
--- a/ext/openssl/tests/session_resumption_invalid_session_import.phpt
+++ b/ext/openssl/tests/session_resumption_invalid_session_import.phpt
@@ -15,9 +15,5 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_cache_disabled.pem.tmp');
-?>
 --EXPECT--
 Failed to import session data
diff --git a/ext/openssl/tests/session_resumption_serialize_session.phpt b/ext/openssl/tests/session_resumption_serialize_session.phpt
index f2f3c98e5e5b..ca43c46c3901 100644
--- a/ext/openssl/tests/session_resumption_serialize_session.phpt
+++ b/ext/openssl/tests/session_resumption_serialize_session.phpt
@@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
 --FILE--
 <?php
-$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp';
+$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize_session.pem.tmp';
 
 $serverCode = <<<'CODE'
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
@@ -68,7 +68,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp');
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize_session.pem.tmp');
 ?>
 --EXPECTF--
 string(%d) "O:15:"Openssl\Session":1:{s:3:"pem";s:%d:"-----BEGIN SSL SESSION PARAMETERS-----
diff --git a/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt b/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt
index 02c6a7dcfdc7..f8aa9ce33050 100644
--- a/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt
+++ b/ext/openssl/tests/session_resumption_server_external_with_context_id.phpt
@@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
 --FILE--
 <?php
-$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp';
+$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id.pem.tmp';
 
 $serverCode = <<<'CODE'
     $sessionStore = [];
@@ -105,7 +105,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp');
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id.pem.tmp');
 ?>
 --EXPECTF--
 Client first connection resumed: no
diff --git a/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt b/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt
index bdc3d2ce1bf6..7b4d8bfa5a99 100644
--- a/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt
+++ b/ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt
@@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
 --FILE--
 <?php
-$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp';
+$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id_tls12.pem.tmp';
 
 $serverCode = <<<'CODE'
     $sessionStore = [];
@@ -105,7 +105,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp');
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id_tls12.pem.tmp');
 ?>
 --EXPECTF--
 Client first connection resumed: no
diff --git a/ext/openssl/tests/stream_server_reneg_limit.phpt b/ext/openssl/tests/stream_server_reneg_limit.phpt
index d84906c81ca7..b8e7c1726734 100644
--- a/ext/openssl/tests/stream_server_reneg_limit.phpt
+++ b/ext/openssl/tests/stream_server_reneg_limit.phpt
@@ -25,7 +25,7 @@ $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_server_reneg_limit.pem.tmp';
 
 $serverCode = <<<'CODE'
     $printed = false;
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create(['ssl' => [
         'local_cert' => '%s',
@@ -42,7 +42,7 @@ $serverCode = <<<'CODE'
     ]]);
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify(message: stream_socket_get_name($server, false));
 
     $clients = [];
     while (1) {
@@ -71,9 +71,9 @@ CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    phpt_wait();
+    $serverUri = trim(phpt_wait());
 
-    $cmd = 'openssl s_client -connect 127.0.0.1:64321';
+    $cmd = 'openssl s_client -connect ' . escapeshellarg($serverUri);
     $descriptorSpec = [["pipe", "r"], ["pipe", "w"], ["pipe", "w"]];
     $process = proc_open($cmd, $descriptorSpec, $pipes);
 
diff --git a/ext/uri/tests/003.phpt b/ext/uri/tests/003.phpt
deleted file mode 100644
index 38d62b0ec8e6..000000000000
--- a/ext/uri/tests/003.phpt
+++ /dev/null
@@ -1,89 +0,0 @@
---TEST--
-Parse special URIs
---FILE--
-<?php
-
-var_dump(Uri\Rfc3986\Uri::parse("http://username:password@héééostname:9090/gah/../path?arg=vaéue#anchor"));
-var_dump(Uri\WhatWg\Url::parse("http://username:password@héééostname:9090/gah/../path?arg=vaéue#anchor"));
-
-var_dump(Uri\Rfc3986\Uri::parse("//host123/"));
-var_dump(Uri\Rfc3986\Uri::parse("///foo/"));
-var_dump(Uri\Rfc3986\Uri::parse("/page:1"));
-var_dump(Uri\WhatWg\Url::parse("/page:1"));
-
-?>
---EXPECTF--
-NULL
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  string(8) "username"
-  ["password"]=>
-  string(8) "password"
-  ["host"]=>
-  string(18) "xn--hostname-b1aaa"
-  ["port"]=>
-  int(9090)
-  ["path"]=>
-  string(5) "/path"
-  ["query"]=>
-  string(14) "arg=va%C3%A9ue"
-  ["fragment"]=>
-  string(6) "anchor"
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  NULL
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(7) "host123"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  NULL
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(0) ""
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(5) "/foo/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  NULL
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(7) "/page:1"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-NULL
diff --git a/ext/uri/tests/004.phpt b/ext/uri/tests/004.phpt
deleted file mode 100644
index c6ad96ce99a7..000000000000
--- a/ext/uri/tests/004.phpt
+++ /dev/null
@@ -1,83 +0,0 @@
---TEST--
-Parse invalid URLs
---FILE--
-<?php
-
-var_dump(new Uri\Rfc3986\Uri(""));
-var_dump(Uri\Rfc3986\Uri::parse(""));
-
-try {
-    new Uri\WhatWg\Url("");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-var_dump(Uri\WhatWg\Url::parse(""));
-
-var_dump(Uri\Rfc3986\Uri::parse("192.168/contact.html"));
-var_dump(Uri\WhatWg\Url::parse("192.168/contact.html", null));
-
-var_dump(Uri\Rfc3986\Uri::parse("http://RuPaul's Drag Race All Stars 7 Winners Cast on This Season's"));
-var_dump(Uri\WhatWg\Url::parse("http://RuPaul's Drag Race All Stars 7 Winners Cast on This Season's", null));
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  NULL
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  NULL
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-Uri\WhatWg\InvalidUrlException: The specified URI is malformed (MissingSchemeNonRelativeUrl)
-NULL
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  NULL
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(20) "192.168/contact.html"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-NULL
-NULL
-NULL
diff --git a/ext/uri/tests/006.phpt b/ext/uri/tests/006.phpt
deleted file mode 100644
index e7fa79a8b837..000000000000
--- a/ext/uri/tests/006.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-Test successful manual Uri child instance creation
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("https://username:password@example.com:8080/path?q=r#fragment");
-var_dump($uri);
-
-$url = new Uri\WhatWg\Url("https://username:password@example.com:8080/path?q=r#fragment");
-var_dump($url);
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  string(8) "username"
-  ["password"]=>
-  string(8) "password"
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  int(8080)
-  ["path"]=>
-  string(5) "/path"
-  ["query"]=>
-  string(3) "q=r"
-  ["fragment"]=>
-  string(8) "fragment"
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  string(8) "username"
-  ["password"]=>
-  string(8) "password"
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  int(8080)
-  ["path"]=>
-  string(5) "/path"
-  ["query"]=>
-  string(3) "q=r"
-  ["fragment"]=>
-  string(8) "fragment"
-}
diff --git a/ext/uri/tests/007.phpt b/ext/uri/tests/007.phpt
deleted file mode 100644
index 9d2f389e2513..000000000000
--- a/ext/uri/tests/007.phpt
+++ /dev/null
@@ -1,68 +0,0 @@
---TEST--
-Test URI creation errors
---FILE--
-<?php
-
-try {
-    new Uri\Rfc3986\Uri("https://example.com:8080@username:password/path?q=r#fragment");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    new Uri\WhatWg\Url("https://example.com:8080@username:password/path?q=r#fragment");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-    var_dump($e->errors);
-}
-
-$failures = [];
-$url = new Uri\WhatWg\Url(" https://example.org ", null, $failures);
-var_dump($url->toAsciiString());
-var_dump($failures);
-
-?>
---EXPECTF--
-Uri\InvalidUriException: The specified URI is malformed
-Uri\WhatWg\InvalidUrlException: The specified URI is malformed (PortInvalid)
-array(%d) {
-  [0]=>
-  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
-    ["context"]=>
-    string(26) "password/path?q=r#fragment"
-    ["type"]=>
-    enum(Uri\WhatWg\UrlValidationErrorType::PortInvalid)
-    ["failure"]=>
-    bool(true)
-  }
-  [1]=>
-  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
-    ["context"]=>
-    string(36) "@username:password/path?q=r#fragment"
-    ["type"]=>
-    enum(Uri\WhatWg\UrlValidationErrorType::InvalidCredentials)
-    ["failure"]=>
-    bool(false)
-  }
-}
-string(20) "https://example.org/"
-array(2) {
-  [0]=>
-  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
-    ["context"]=>
-    string(1) " "
-    ["type"]=>
-    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
-    ["failure"]=>
-    bool(false)
-  }
-  [1]=>
-  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
-    ["context"]=>
-    string(21) " https://example.org "
-    ["type"]=>
-    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
-    ["failure"]=>
-    bool(false)
-  }
-}
diff --git a/ext/uri/tests/008.phpt b/ext/uri/tests/008.phpt
deleted file mode 100644
index 0a02bae63163..000000000000
--- a/ext/uri/tests/008.phpt
+++ /dev/null
@@ -1,76 +0,0 @@
---TEST--
-Test Uri getters
---FILE--
-<?php
-
-function callRfc3986Getters($uri)
-{
-    var_dump($uri->getScheme());
-    var_dump($uri->getRawScheme());
-    var_dump($uri->getUsername());
-    var_dump($uri->getRawUsername());
-    var_dump($uri->getPassword());
-    var_dump($uri->getRawPassword());
-    var_dump($uri->getUserInfo());
-    var_dump($uri->getRawUserInfo());
-    var_dump($uri->getHost());
-    var_dump($uri->getRawHost());
-    var_dump($uri->getPort());
-    var_dump($uri->getPath());
-    var_dump($uri->getRawPath());
-    var_dump($uri->getQuery());
-    var_dump($uri->getRawQuery());
-    var_dump($uri->getFragment());
-    var_dump($uri->getRawFragment());
-}
-
-function callWhatWgGetters($url)
-{
-    var_dump($url->getScheme());
-    var_dump($url->getUsername());
-    var_dump($url->getPassword());
-    var_dump($url->getAsciiHost());
-    var_dump($url->getUnicodeHost());
-    var_dump($url->getPort());
-    var_dump($url->getPath());
-    var_dump($url->getQuery());
-    var_dump($url->getFragment());
-}
-
-$uri = Uri\Rfc3986\Uri::parse("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-callRfc3986Getters($uri);
-
-echo "\n";
-
-$url = Uri\WhatWg\Url::parse("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-callWhatWgGetters($url);
-
-?>
---EXPECT--
-string(5) "https"
-string(5) "https"
-string(8) "username"
-string(8) "username"
-string(8) "password"
-string(8) "password"
-string(17) "username:password"
-string(17) "username:password"
-string(15) "www.example.com"
-string(15) "www.example.com"
-int(8080)
-string(30) "/pathname1/pathname2/pathname3"
-string(30) "/pathname1/pathname2/pathname3"
-string(10) "query=true"
-string(10) "query=true"
-string(11) "hash-exists"
-string(11) "hash-exists"
-
-string(5) "https"
-string(8) "username"
-string(8) "password"
-string(15) "www.example.com"
-string(15) "www.example.com"
-int(8080)
-string(30) "/pathname1/pathname2/pathname3"
-string(10) "query=true"
-string(11) "hash-exists"
diff --git a/ext/uri/tests/009.phpt b/ext/uri/tests/009.phpt
deleted file mode 100644
index 9c896d0153b2..000000000000
--- a/ext/uri/tests/009.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-Test parsing with IANA schemes
---FILE--
-<?php
-
-var_dump(Uri\Rfc3986\Uri::parse("chrome-extension://example.com"));
-var_dump(Uri\WhatWg\Url::parse("chrome-extension://example.com"));
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(16) "chrome-extension"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(16) "chrome-extension"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
diff --git a/ext/uri/tests/010.phpt b/ext/uri/tests/010.phpt
deleted file mode 100644
index ff5a37000775..000000000000
--- a/ext/uri/tests/010.phpt
+++ /dev/null
@@ -1,84 +0,0 @@
---TEST--
-Test parsing URIs when a base URI is present
---FILE--
-<?php
-
-var_dump(Uri\Rfc3986\Uri::parse("http://example.com/path/to/file2", new Uri\Rfc3986\Uri("https://test.com")));
-var_dump(Uri\Rfc3986\Uri::parse("/path/to/file2", new Uri\Rfc3986\Uri("https://test.com")));
-var_dump(Uri\WhatWg\Url::parse("http://example.com/path/to/file1", new Uri\WhatWg\Url("https://test.com")));
-var_dump(Uri\WhatWg\Url::parse("/path/to/file1", new Uri\WhatWg\Url("https://test.com")));
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(14) "/path/to/file2"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(8) "test.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(14) "/path/to/file2"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(14) "/path/to/file1"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(8) "test.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(14) "/path/to/file1"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
diff --git a/ext/uri/tests/011.phpt b/ext/uri/tests/011.phpt
deleted file mode 100644
index 0e8fd8ec8f48..000000000000
--- a/ext/uri/tests/011.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-Test encoding and normalization
---FILE--
-<?php
-
-var_dump(Uri\Rfc3986\Uri::parse("http://////www.EXAMPLE.com:80")->toRawString());
-var_dump(Uri\Rfc3986\Uri::parse("https://www.example.com/dir1/../dir2")->toRawString());
-var_dump(Uri\Rfc3986\Uri::parse("https://你好你好"));
-var_dump(Uri\Rfc3986\Uri::parse("https://０Ｘｃ０．０２５０．０１"));
-var_dump(Uri\Rfc3986\Uri::parse("HttPs://0300.0250.0000.0001/path?query=foo%20bar")->toRawString());
-
-var_dump(Uri\WhatWg\Url::parse("http://////www.EXAMPLE.com:80")->toAsciiString());
-var_dump(Uri\WhatWg\Url::parse("https://www.example.com:443/dir1/../dir2")->toAsciiString());
-var_dump(Uri\WhatWg\Url::parse("https://你好你好")->toAsciiString());
-var_dump(Uri\WhatWg\Url::parse("https://你好你好")->toUnicodeString());
-var_dump(Uri\WhatWg\Url::parse("https://０Ｘｃ０．０２５０．０１")->toAsciiString());
-var_dump(Uri\WhatWg\Url::parse("HttPs://0300.0250.0000.0001/path?query=foo%20bar")->toAsciiString());
-
-?>
---EXPECT--
-string(29) "http://////www.EXAMPLE.com:80"
-string(36) "https://www.example.com/dir1/../dir2"
-NULL
-NULL
-string(48) "HttPs://0300.0250.0000.0001/path?query=foo%20bar"
-string(23) "http://www.example.com/"
-string(28) "https://www.example.com/dir2"
-string(23) "https://xn--6qqa088eba/"
-string(21) "https://你好你好/"
-string(20) "https://192.168.0.1/"
-string(40) "https://192.168.0.1/path?query=foo%20bar"
diff --git a/ext/uri/tests/012.phpt b/ext/uri/tests/012.phpt
deleted file mode 100644
index e033223a6426..000000000000
--- a/ext/uri/tests/012.phpt
+++ /dev/null
@@ -1,85 +0,0 @@
---TEST--
-Test parsing of various schemes
---FILE--
-<?php
-
-var_dump(Uri\Rfc3986\Uri::parse("mailto:Joe@Example.COM"));
-var_dump(Uri\WhatWg\Url::parse("mailto:Joe@Example.COM"));
-
-var_dump(Uri\Rfc3986\Uri::parse("file:///E:/Documents%20and%20Settings"));
-var_dump(Uri\WhatWg\Url::parse("file:///E:\\Documents and Settings"));
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(6) "mailto"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(15) "Joe@Example.COM"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(6) "mailto"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(15) "Joe@Example.COM"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(4) "file"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(0) ""
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(30) "/E:/Documents%20and%20Settings"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(4) "file"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(0) ""
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(30) "/E:/Documents%20and%20Settings"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
diff --git a/ext/uri/tests/013.phpt b/ext/uri/tests/013.phpt
deleted file mode 100644
index 865843ec27e8..000000000000
--- a/ext/uri/tests/013.phpt
+++ /dev/null
@@ -1,129 +0,0 @@
---TEST--
-Test parsing of query strings
---FILE--
-<?php
-
-var_dump(Uri\Rfc3986\Uri::parse("http://example.com?foo=Hell%C3%B3+W%C3%B6rld"));
-var_dump(Uri\Rfc3986\Uri::parse("http://example.com?foo=Helló Wörld"));
-
-var_dump(Uri\WhatWg\Url::parse("http://example.com?foo=Hell%C3%B3+W%C3%B6rld"));
-var_dump(Uri\WhatWg\Url::parse("http://example.com?foo=Helló Wörld"));
-
-var_dump(Uri\Rfc3986\Uri::parse("http://example.com?foobar=%27%3Cscript%3E+%2B+%40"));
-var_dump(Uri\Rfc3986\Uri::parse("http://example.com?foobar='<script> + @"));
-
-var_dump(Uri\WhatWg\Url::parse("http://example.com?foobar=%27%3Cscript%3E+%2B+%40"));
-var_dump(Uri\WhatWg\Url::parse("http://example.com?foobar='<script> + @"));
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  string(25) "foo=Hell%C3%B3+W%C3%B6rld"
-  ["fragment"]=>
-  NULL
-}
-NULL
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  string(25) "foo=Hell%C3%B3+W%C3%B6rld"
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  string(27) "foo=Hell%C3%B3%20W%C3%B6rld"
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  string(30) "foobar=%27%3Cscript%3E+%2B+%40"
-  ["fragment"]=>
-  NULL
-}
-NULL
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  string(30) "foobar=%27%3Cscript%3E+%2B+%40"
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(4) "http"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  string(30) "foobar=%27%3Cscript%3E%20+%20@"
-  ["fragment"]=>
-  NULL
-}
diff --git a/ext/uri/tests/014.phpt b/ext/uri/tests/014.phpt
deleted file mode 100644
index 2966e2a9dcf1..000000000000
--- a/ext/uri/tests/014.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Test recomposition of URIs
---FILE--
-<?php
-
-var_dump(Uri\Rfc3986\Uri::parse("http://example.com?foo=Hell%C3%B3+W%C3%B6rld")->toRawString());
-
-var_dump(Uri\WhatWg\Url::parse("http://example.com?foo=Hell%C3%B3+W%C3%B6rld")->toAsciiString());
-
-?>
---EXPECT--
-string(44) "http://example.com?foo=Hell%C3%B3+W%C3%B6rld"
-string(45) "http://example.com/?foo=Hell%C3%B3+W%C3%B6rld"
diff --git a/ext/uri/tests/018.phpt b/ext/uri/tests/018.phpt
deleted file mode 100644
index 7a7be9b3c19f..000000000000
--- a/ext/uri/tests/018.phpt
+++ /dev/null
@@ -1,89 +0,0 @@
---TEST--
-Test property mutation
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
-$uri2 = clone $uri1;
-var_dump($uri1);
-var_dump($uri2);
-
-$url3 = Uri\WhatWg\Url::parse("https://example.com");
-$url4 = clone $url3;
-var_dump($url3);
-var_dump($url4);
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#1 (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#2 (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#3 (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#4 (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
diff --git a/ext/uri/tests/019.phpt b/ext/uri/tests/019.phpt
deleted file mode 100644
index 7f62a64e9fde..000000000000
--- a/ext/uri/tests/019.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-Test IDNA support
---FILE--
-<?php
-
-$uri = Uri\Rfc3986\Uri::parse("🐘");
-var_dump($uri);
-
-$errors = [];
-$url = Uri\WhatWg\Url::parse("🐘", null, $errors);
-var_dump($url);
-var_dump($errors);
-
-$uri = Uri\Rfc3986\Uri::parse("https://🐘.com/🐘?🐘=🐘");
-var_dump($uri);
-
-$url = Uri\WhatWg\Url::parse("https://🐘.com/🐘?🐘=🐘", null);
-var_dump($url);
-var_dump($url->getAsciiHost());
-var_dump($url->getUnicodeHost());
-var_dump($url->toAsciiString());
-var_dump($url->toUnicodeString());
-
-?>
---EXPECTF--
-NULL
-NULL
-array(1) {
-  [0]=>
-  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
-    ["context"]=>
-    string(4) "🐘"
-    ["type"]=>
-    enum(Uri\WhatWg\UrlValidationErrorType::MissingSchemeNonRelativeUrl)
-    ["failure"]=>
-    bool(true)
-  }
-}
-NULL
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(12) "xn--go8h.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(13) "/%F0%9F%90%98"
-  ["query"]=>
-  string(25) "%F0%9F%90%98=%F0%9F%90%98"
-  ["fragment"]=>
-  NULL
-}
-string(12) "xn--go8h.com"
-string(8) "🐘.com"
-string(59) "https://xn--go8h.com/%F0%9F%90%98?%F0%9F%90%98=%F0%9F%90%98"
-string(55) "https://🐘.com/%F0%9F%90%98?%F0%9F%90%98=%F0%9F%90%98"
diff --git a/ext/uri/tests/023.phpt b/ext/uri/tests/023.phpt
deleted file mode 100644
index 8899abc16b6c..000000000000
--- a/ext/uri/tests/023.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-Test property mutation - scheme
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
-var_dump($uri1->getRawScheme());
-var_dump($uri1->getScheme());
-
-$uri2 = $uri1->withScheme("http");
-var_dump($uri2->getRawScheme());
-var_dump($uri2->getScheme());
-
-$uri3 = $uri2->withScheme(null);
-var_dump($uri3->getRawScheme());
-var_dump($uri3->getScheme());
-
-try {
-    $uri3->withScheme("");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $uri3->withScheme("http%73");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com");
-$url2 = $url1->withScheme("http");
-
-var_dump($url1->getScheme());
-var_dump($url2->getScheme());
-
-try {
-    $url2->withScheme("");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $url2->withScheme("http%73");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-?>
---EXPECT--
-string(5) "https"
-string(5) "https"
-string(4) "http"
-string(4) "http"
-NULL
-NULL
-Uri\InvalidUriException: The specified scheme is malformed
-Uri\InvalidUriException: The specified scheme is malformed
-string(5) "https"
-string(4) "http"
-Uri\WhatWg\InvalidUrlException: The specified scheme is malformed
-Uri\WhatWg\InvalidUrlException: The specified scheme is malformed
diff --git a/ext/uri/tests/024.phpt b/ext/uri/tests/024.phpt
deleted file mode 100644
index 4147ff3ae124..000000000000
--- a/ext/uri/tests/024.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test property mutation - username
---FILE--
-<?php
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com");
-$url2 = $url1->withUsername("user");
-$url3 = $url2->withUsername(null);
-$url4 = $url3->withUsername("%75s%2Fr"); // us/r
-$url5 = $url4->withUsername("u:s/r");
-
-$url6 = Uri\WhatWg\Url::parse("file:///foo/bar/");
-$url6 = $url6->withUsername("user");
-
-var_dump($url2->getUsername());
-var_dump($url3->getUsername());
-var_dump($url4->getUsername());
-var_dump($url5->getUsername());
-var_dump($url6->getUsername());
-
-?>
---EXPECT--
-string(4) "user"
-NULL
-string(8) "%75s%2Fr"
-string(9) "u%3As%2Fr"
-NULL
diff --git a/ext/uri/tests/025.phpt b/ext/uri/tests/025.phpt
deleted file mode 100644
index a6dd505fcca1..000000000000
--- a/ext/uri/tests/025.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test property mutation - password
---FILE--
-<?php
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com");
-$url2 = $url1->withPassword("pass");
-$url3 = $url2->withPassword(null);
-$url4 = $url3->withPassword("p%61ss");
-$url5 = $url4->withPassword("p:s/");
-
-$url6 = Uri\WhatWg\Url::parse("file:///foo/bar/");
-$url6 = $url6->withUsername("pass");
-
-var_dump($url2->getPassword());
-var_dump($url3->getPassword());
-var_dump($url4->getPassword());
-var_dump($url5->getPassword());
-var_dump($url6->getPassword());
-
-?>
---EXPECT--
-string(4) "pass"
-NULL
-string(6) "p%61ss"
-string(8) "p%3As%2F"
-NULL
diff --git a/ext/uri/tests/026.phpt b/ext/uri/tests/026.phpt
deleted file mode 100644
index 179b00d38572..000000000000
--- a/ext/uri/tests/026.phpt
+++ /dev/null
@@ -1,137 +0,0 @@
---TEST--
-Test property mutation - host
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
-var_dump($uri1->getRawHost());
-var_dump($uri1->getHost());
-
-$uri2 = $uri1->withHost("test.com");
-var_dump($uri2->getRawHost());
-var_dump($uri2->getHost());
-
-$uri3 = $uri2->withHost("t%65st.com"); // test.com
-var_dump($uri3->getRawHost());
-var_dump($uri3->getHost());
-
-$uri4 = $uri3->withHost(null);
-var_dump($uri4->getRawHost());
-var_dump($uri4->getHost());
-
-$uri5 = $uri4->withHost("192.168.0.1");
-var_dump($uri5->getRawHost());
-var_dump($uri5->getHost());
-
-$uri6 = $uri5->withHost("[2001:db8:3333:4444:5555:6666:7777:8888]");
-var_dump($uri6->getRawHost());
-var_dump($uri6->getHost());
-
-try {
-    $uri3->withHost("test.com:8080");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $uri3->withHost("t%3As%2Ft.com"); // t:s/t.com
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $uri3->withHost("t:s/t.com");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $uri2->withHost("");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$uri1 = Uri\Rfc3986\Uri::parse("ftp://user:pass@foo.com?query=abc#foo");
-$uri2 = $uri1->withHost("test.com");
-
-var_dump($uri1->getHost());
-var_dump($uri2->getHost());
-
-try {
-    $uri1->withHost(null);
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com");
-$url2 = $url1->withHost("test.com");
-$url3 = $url2->withHost("t%65st.com"); // test.com
-$url4 = $url3->withHost("192.168.0.1");
-$url5 = $url4->withHost("[2001:db8:3333:4444:5555:6666:7777:8888]");
-
-var_dump($url1->getAsciiHost());
-var_dump($url2->getAsciiHost());
-var_dump($url3->getAsciiHost());
-var_dump($url4->getAsciiHost());
-var_dump($url5->getAsciiHost());
-
-try {
-    $url3->withHost("test.com:8080");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $url3->withHost("t%3As%2Ft.com"); // t:s/t.com
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $url3->withHost("t:s/t.com");     // t:s/t.com
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $url2->withHost(null);
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$url1 = Uri\WhatWg\Url::parse("ftp://foo.com?query=abc#foo");
-$url2 = $url1->withHost("test.com");
-
-var_dump($url1->getAsciiHost());
-var_dump($url2->getAsciiHost());
-
-?>
---EXPECTF--
-string(11) "example.com"
-string(11) "example.com"
-string(8) "test.com"
-string(8) "test.com"
-string(10) "t%65st.com"
-string(8) "test.com"
-NULL
-NULL
-string(11) "192.168.0.1"
-string(11) "192.168.0.1"
-string(40) "[2001:db8:3333:4444:5555:6666:7777:8888]"
-string(40) "[2001:db8:3333:4444:5555:6666:7777:8888]"
-Uri\InvalidUriException: The specified host is malformed
-Uri\InvalidUriException: The specified host is malformed
-string(7) "foo.com"
-string(8) "test.com"
-Uri\InvalidUriException: Cannot remove the host from a URI that has a userinfo
-string(11) "example.com"
-string(8) "test.com"
-string(8) "test.com"
-string(11) "192.168.0.1"
-string(40) "[2001:db8:3333:4444:5555:6666:7777:8888]"
-Uri\WhatWg\InvalidUrlException: The specified host is malformed
-Uri\WhatWg\InvalidUrlException: The specified host is malformed (DomainInvalidCodePoint)
-Uri\WhatWg\InvalidUrlException: The specified host is malformed
-Uri\WhatWg\InvalidUrlException: The specified host is malformed (HostMissing)
-string(7) "foo.com"
-string(8) "test.com"
diff --git a/ext/uri/tests/026_userinfo.phpt b/ext/uri/tests/026_userinfo.phpt
deleted file mode 100644
index a29abddf9720..000000000000
--- a/ext/uri/tests/026_userinfo.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-Test property mutation - userinfo
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
-var_dump($uri1->getRawUserInfo());
-var_dump($uri1->getUserInfo());
-
-$uri2 = $uri1->withUserInfo("user");
-var_dump($uri2->getRawUserInfo());
-var_dump($uri2->getUserInfo());
-
-$uri3 = $uri2->withUserInfo(null);
-var_dump($uri3->getRawUserInfo());
-var_dump($uri3->getUserInfo());
-
-$uri4 = $uri3->withUserInfo("%75s%2Fr:pass"); // us/r:pass
-var_dump($uri4->getRawUserInfo());
-var_dump($uri4->getUserInfo());
-
-$uri1 = Uri\Rfc3986\Uri::parse("/foo");
-$uri2 = $uri1->withUserInfo(null);
-var_dump($uri2->getPort());
-
-try {
-    $uri4->withUserInfo("u:s/r");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$uri5 = Uri\Rfc3986\Uri::parse("file:///foo/bar/");
-$uri6 = $uri5->withUserinfo("user:pass");
-
-var_dump($uri5->getUserInfo());
-var_dump($uri6->getUserInfo());
-
-?>
---EXPECT--
-NULL
-NULL
-string(4) "user"
-string(4) "user"
-NULL
-NULL
-string(13) "%75s%2Fr:pass"
-string(11) "us%2Fr:pass"
-NULL
-Uri\InvalidUriException: The specified userinfo is malformed
-NULL
-string(9) "user:pass"
diff --git a/ext/uri/tests/027.phpt b/ext/uri/tests/027.phpt
deleted file mode 100644
index 2309cace93d9..000000000000
--- a/ext/uri/tests/027.phpt
+++ /dev/null
@@ -1,73 +0,0 @@
---TEST--
-Test property mutation - port
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com:8080");
-$uri2 = $uri1->withPort(22);
-$uri3 = $uri2->withPort(null);
-
-var_dump($uri1->getPort());
-var_dump($uri2->getPort());
-var_dump($uri3->getPort());
-
-$uri1 = Uri\Rfc3986\Uri::parse("ftp://foo.com:443?query=abc#foo");
-$uri2 = $uri1->withPort(8080);
-
-var_dump($uri1->getPort());
-var_dump($uri2->getPort());
-
-$uri1 = Uri\Rfc3986\Uri::parse("file:///foo/bar");
-$uri2 = $uri1->withPort(80);
-
-var_dump($uri1->getPort());
-var_dump($uri2->getPort());
-
-$uri1 = Uri\Rfc3986\Uri::parse("/foo");
-$uri2 = $uri1->withPort(null);
-var_dump($uri2->getPort());
-
-try {
-    $uri1->withPort(1);
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com:8080");
-$url2 = $url1->withPort(22);
-$url3 = $url2->withPort(null);
-
-var_dump($url1->getPort());
-var_dump($url2->getPort());
-var_dump($url3->getPort());
-
-$url1 = Uri\WhatWg\Url::parse("ftp://foo.com:443?query=abc#foo");
-$url2 = $url1->withPort(8080);
-
-var_dump($url1->getPort());
-var_dump($url2->getPort());
-
-$url1 = Uri\WhatWg\Url::parse("file:///foo/bar");
-$url2 = $url1->withPort(80);
-
-var_dump($url1->getPort());
-var_dump($url2->getPort());
-
-?>
---EXPECT--
-int(8080)
-int(22)
-NULL
-int(443)
-int(8080)
-NULL
-int(80)
-NULL
-Uri\InvalidUriException: Cannot set a port without having a host
-int(8080)
-int(22)
-NULL
-int(443)
-int(8080)
-NULL
-NULL
diff --git a/ext/uri/tests/028.phpt b/ext/uri/tests/028.phpt
deleted file mode 100644
index 708a50d4f2ec..000000000000
--- a/ext/uri/tests/028.phpt
+++ /dev/null
@@ -1,87 +0,0 @@
---TEST--
-Test property mutation - path
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com/foo/bar/");
-var_dump($uri1->getRawPath());
-var_dump($uri1->getPath());
-
-$uri2 = $uri1->withPath("/foo");
-var_dump($uri2->getRawPath());
-var_dump($uri2->getPath());
-
-$uri3 = $uri2->withPath("/t%65st");
-var_dump($uri3->getRawPath());
-var_dump($uri3->getPath());
-
-$uri4 = $uri3->withPath("/foo%2Fbar");
-var_dump($uri4->getRawPath());
-var_dump($uri4->getPath());
-
-$uri5 = $uri4->withPath("");
-var_dump($uri5->getRawPath());
-var_dump($uri5->getPath());
-
-try {
-    $uri5->withPath("test");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $uri5->withPath("/#");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$uri1 = Uri\Rfc3986\Uri::parse("/foo");
-$uri2 = $uri1->withPath("bar");
-
-var_dump($uri1->getPath());
-var_dump($uri2->getPath());
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com/foo/bar/");
-$url2 = $url1->withPath("/foo");
-$url3 = $url2->withPath("");
-$url4 = $url3->withPath("t%65st");
-$url5 = $url4->withPath("/foo%2Fbar");
-$url6 = $url5->withPath("/#");
-
-var_dump($url1->getPath());
-var_dump($url2->getPath());
-var_dump($url3->getPath());
-var_dump($url4->getPath());
-var_dump($url5->getPath());
-var_dump($url6->getPath());
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com/");
-$uri2 = $url1->withPath("/foo");
-
-var_dump($url1->getPath());
-var_dump($url2->getPath());
-
-?>
---EXPECT--
-string(9) "/foo/bar/"
-string(9) "/foo/bar/"
-string(4) "/foo"
-string(4) "/foo"
-string(7) "/t%65st"
-string(5) "/test"
-string(10) "/foo%2Fbar"
-string(10) "/foo%2Fbar"
-string(0) ""
-string(0) ""
-Uri\InvalidUriException: The specified path is malformed
-Uri\InvalidUriException: The specified path is malformed
-string(4) "/foo"
-string(3) "bar"
-string(9) "/foo/bar/"
-string(4) "/foo"
-string(1) "/"
-string(7) "/t%65st"
-string(10) "/foo%2Fbar"
-string(4) "/%23"
-string(1) "/"
-string(4) "/foo"
diff --git a/ext/uri/tests/029.phpt b/ext/uri/tests/029.phpt
deleted file mode 100644
index c1ce0e10d94c..000000000000
--- a/ext/uri/tests/029.phpt
+++ /dev/null
@@ -1,93 +0,0 @@
---TEST--
-Test property mutation - query
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com?foo=bar");
-var_dump($uri1->getRawQuery());
-var_dump($uri1->getQuery());
-
-$uri2 = $uri1->withQuery("foo=baz");
-var_dump($uri2->getRawQuery());
-var_dump($uri2->getQuery());
-
-$uri3 = $uri2->withQuery(null);
-var_dump($uri3->getRawQuery());
-var_dump($uri3->getQuery());
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
-var_dump($uri1->getRawQuery());
-var_dump($uri1->getQuery());
-
-$uri2 = $uri1->withQuery("?foo=bar&foo=baz");
-var_dump($uri2->getRawQuery());
-var_dump($uri2->getQuery());
-
-$uri3 = $uri1->withQuery("foo=bar&foo=baz");
-var_dump($uri3->getRawQuery());
-var_dump($uri3->getQuery());
-
-$uri4 = $uri3->withQuery("t%65st");
-var_dump($uri4->getRawQuery());
-var_dump($uri4->getQuery());
-
-$uri5 = $uri4->withQuery("foo=foo%26bar&baz=/qux%3D");
-var_dump($uri5->getRawQuery());
-var_dump($uri5->getQuery());
-
-try {
-    $uri5->withQuery("#");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com?foo=bar");
-$url2 = $url1->withQuery("?foo=baz");
-$url3 = $url2->withQuery(null);
-
-var_dump($url1->getQuery());
-var_dump($url2->getQuery());
-var_dump($url3->getQuery());
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com");
-$url2 = $url1->withQuery("?foo=bar&foo=baz");
-$url3 = $url1->withQuery("foo=bar&foo=baz");
-$url4 = $url3->withQuery("t%65st");
-$url5 = $url4->withQuery("foo=foo%26bar&baz=/qux%3D");
-$url6 = $url5->withQuery("#");
-
-var_dump($url1->getQuery());
-var_dump($url2->getQuery());
-var_dump($url3->getQuery());
-var_dump($url4->getQuery());
-var_dump($url5->getQuery());
-var_dump($url6->getQuery());
-
-?>
---EXPECT--
-string(7) "foo=bar"
-string(7) "foo=bar"
-string(7) "foo=baz"
-string(7) "foo=baz"
-NULL
-NULL
-NULL
-NULL
-string(16) "?foo=bar&foo=baz"
-string(16) "?foo=bar&foo=baz"
-string(15) "foo=bar&foo=baz"
-string(15) "foo=bar&foo=baz"
-string(6) "t%65st"
-string(4) "test"
-string(25) "foo=foo%26bar&baz=/qux%3D"
-string(25) "foo=foo%26bar&baz=/qux%3D"
-Uri\InvalidUriException: The specified query is malformed
-string(7) "foo=bar"
-string(7) "foo=baz"
-NULL
-NULL
-string(15) "foo=bar&foo=baz"
-string(15) "foo=bar&foo=baz"
-string(6) "t%65st"
-string(25) "foo=foo%26bar&baz=/qux%3D"
-string(3) "%23"
diff --git a/ext/uri/tests/030.phpt b/ext/uri/tests/030.phpt
deleted file mode 100644
index e3df0f939980..000000000000
--- a/ext/uri/tests/030.phpt
+++ /dev/null
@@ -1,69 +0,0 @@
---TEST--
-Test property mutation - fragment
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com#fragment1");
-var_dump($uri1->getRawFragment());
-var_dump($uri1->getFragment());
-
-$uri2 = $uri1->withFragment("fragment2");
-var_dump($uri2->getRawFragment());
-var_dump($uri2->getFragment());
-
-$uri3 = $uri2->withFragment(null);
-var_dump($uri3->getRawFragment());
-var_dump($uri3->getFragment());
-
-try {
-    $uri3->withFragment(" ");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    $uri1->withFragment("#fragment2");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$uri1 = Uri\Rfc3986\Uri::parse("https://example.com?abc=def");
-$uri2 = $uri1->withFragment("fragment");
-
-var_dump($uri1->getFragment());
-var_dump($uri2->getFragment());
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com#fragment1");
-$url2 = $url1->withFragment("#fragment2");
-$url3 = $url2->withFragment(null);
-$url4 = $url3->withFragment(" ");
-
-var_dump($url1->getFragment());
-var_dump($url2->getFragment());
-var_dump($url3->getFragment());
-var_dump($url4->getFragment());
-
-$url1 = Uri\WhatWg\Url::parse("https://example.com?abc=def");
-$url2 = $url1->withFragment("#fragment");
-
-var_dump($url1->getFragment());
-var_dump($url2->getFragment());
-
-?>
---EXPECT--
-string(9) "fragment1"
-string(9) "fragment1"
-string(9) "fragment2"
-string(9) "fragment2"
-NULL
-NULL
-Uri\InvalidUriException: The specified fragment is malformed
-Uri\InvalidUriException: The specified fragment is malformed
-NULL
-string(8) "fragment"
-string(9) "fragment1"
-string(9) "fragment2"
-NULL
-string(3) "%20"
-NULL
-string(8) "fragment"
diff --git a/ext/uri/tests/031.phpt b/ext/uri/tests/031.phpt
deleted file mode 100644
index d60190457c1e..000000000000
--- a/ext/uri/tests/031.phpt
+++ /dev/null
@@ -1,178 +0,0 @@
---TEST--
-Test serialization and unserialization
---FILE--
-<?php
-
-$uri1 = new Uri\Rfc3986\Uri("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-$serializedUri1 = serialize($uri1);
-$uri2 = unserialize($serializedUri1);
-
-var_dump($serializedUri1);
-var_dump($uri2);
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":1:{i:0;a:0:{}}'); // less than 2 items
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":3:{i:0;a:0:{}i:1;a:0:{}i:2;a:0:{}}'); // more than 2 items
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;N;i:1;a:0:{}}'); // first item is not an array
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:0:{}i:1;a:0:{}}'); // first array is empty
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";i:1;}i:1;a:0:{}}'); // "uri" key in first array is not a string
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:2:"%1";}i:1;a:0:{}}'); // "uri" key in first array contains invalid URI
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:4:"/uri";}i:1;s:0:"";}'); // second item in not an array
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:4:"/uri";}i:1;a:1:{s:5:"prop1";i:123;}}'); // second array contains a property
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$url1 = new Uri\WhatWg\Url("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-$serializedUrl1 = serialize($url1);
-$url2 = unserialize($serializedUrl1);
-
-var_dump($serializedUrl1);
-var_dump($url2);
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":1:{i:0;a:0:{}}'); // less than 2 items
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":3:{i:0;a:0:{}i:1;a:0:{}i:2;a:0:{}}'); // more than 2 items
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;N;i:1;a:0:{}}'); // first item is not an array
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:0:{}i:1;a:0:{}}'); // first array is empty
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:2:{s:3:"uri";s:19:"https://example.com";s:1:"a";i:1;}i:1;a:0:{}}'); // "uri" key in first array contains more than 1 item
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";i:1;}i:1;a:0:{}}'); // "uri" key in first array is not a string
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:11:"invalid-url";}i:1;a:0:{}}'); // "uri" key in first array contains invalid URL
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:19:"https://example.com";}i:1;s:0:"";}'); // second item in not an array
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-try {
-    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:19:"https://example.com";}i:1;a:1:{s:5:"prop1";i:123;}}'); // second array contains property
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-?>
---EXPECTF--
-string(164) "O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:99:"https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists";}i:1;a:0:{}}"
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  string(8) "username"
-  ["password"]=>
-  string(8) "password"
-  ["host"]=>
-  string(15) "www.example.com"
-  ["port"]=>
-  int(8080)
-  ["path"]=>
-  string(30) "/pathname1/pathname2/pathname3"
-  ["query"]=>
-  string(10) "query=true"
-  ["fragment"]=>
-  string(11) "hash-exists"
-}
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-string(163) "O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:99:"https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists";}i:1;a:0:{}}"
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  string(8) "username"
-  ["password"]=>
-  string(8) "password"
-  ["host"]=>
-  string(15) "www.example.com"
-  ["port"]=>
-  int(8080)
-  ["path"]=>
-  string(30) "/pathname1/pathname2/pathname3"
-  ["query"]=>
-  string(10) "query=true"
-  ["fragment"]=>
-  string(11) "hash-exists"
-}
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-Exception: Invalid serialization data for Uri\WhatWg\Url object
diff --git a/ext/uri/tests/033.phpt b/ext/uri/tests/033.phpt
deleted file mode 100644
index e88baadeba0d..000000000000
--- a/ext/uri/tests/033.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Test var_export
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-var_export($uri);
-echo "\n";
-
-$url = new Uri\WhatWg\Url("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-var_export($url);
-echo "\n";
-
-?>
---EXPECT--
-\Uri\Rfc3986\Uri::__set_state(array(
-))
-\Uri\WhatWg\Url::__set_state(array(
-))
diff --git a/ext/uri/tests/038.phpt b/ext/uri/tests/038.phpt
deleted file mode 100644
index 175a6762894b..000000000000
--- a/ext/uri/tests/038.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-Test toString()
---FILE--
-<?php
-
-$uri1 = Uri\Rfc3986\Uri::parse("HTTPS://////EXAMPLE.com");
-$uri2 = Uri\Rfc3986\Uri::parse("https://example.com");
-$uri3 = Uri\Rfc3986\Uri::parse("https://example.com/foo/..");
-var_dump($uri1->toRawString());
-var_dump($uri1->toString());
-var_dump($uri2->toRawString());
-var_dump($uri2->toString());
-var_dump($uri3->toRawString());
-var_dump($uri3->toString());
-
-$url1 = Uri\WhatWg\Url::parse("HTTPS://////EXAMPLE.com");
-$url2 = Uri\WhatWg\Url::parse("https://example.com");
-$url3 = Uri\WhatWg\Url::parse("https://example.com/foo/..");
-
-var_dump($url1->toUnicodeString());
-var_dump($url1->toAsciiString());
-var_dump($url2->toUnicodeString());
-var_dump($url2->toAsciiString());
-var_dump($url3->toUnicodeString());
-var_dump($url3->toAsciiString());
-
-?>
---EXPECT--
-string(23) "HTTPS://////EXAMPLE.com"
-string(23) "https://////EXAMPLE.com"
-string(19) "https://example.com"
-string(19) "https://example.com"
-string(26) "https://example.com/foo/.."
-string(20) "https://example.com/"
-string(20) "https://example.com/"
-string(20) "https://example.com/"
-string(20) "https://example.com/"
-string(20) "https://example.com/"
-string(20) "https://example.com/"
-string(20) "https://example.com/"
diff --git a/ext/uri/tests/039.phpt b/ext/uri/tests/039.phpt
deleted file mode 100644
index ae662dfd1722..000000000000
--- a/ext/uri/tests/039.phpt
+++ /dev/null
@@ -1,76 +0,0 @@
---TEST--
-Test percent-encoding of different URI components
---FILE--
-<?php
-
-function callRfc3986Getters($uri)
-{
-    var_dump($uri->getScheme());
-    var_dump($uri->getRawScheme());
-    var_dump($uri->getUsername());
-    var_dump($uri->getRawUsername());
-    var_dump($uri->getPassword());
-    var_dump($uri->getRawPassword());
-    var_dump($uri->getUserInfo());
-    var_dump($uri->getRawUserInfo());
-    var_dump($uri->getHost());
-    var_dump($uri->getRawHost());
-    var_dump($uri->getPort());
-    var_dump($uri->getPath());
-    var_dump($uri->getRawPath());
-    var_dump($uri->getQuery());
-    var_dump($uri->getRawQuery());
-    var_dump($uri->getFragment());
-    var_dump($uri->getRawFragment());
-}
-
-function callWhatWgGetters($url)
-{
-    var_dump($url->getScheme());
-    var_dump($url->getUsername());
-    var_dump($url->getPassword());
-    var_dump($url->getAsciiHost());
-    var_dump($url->getUnicodeHost());
-    var_dump($url->getPort());
-    var_dump($url->getPath());
-    var_dump($url->getQuery());
-    var_dump($url->getFragment());
-}
-
-$uri = Uri\Rfc3986\Uri::parse("http://%61pple:p%61ss@ex%61mple.com/foob%61r?%61bc=%61bc#%61bc");
-callRfc3986Getters($uri);
-
-echo "\n";
-
-$url = Uri\WhatWg\Url::parse("http://%61pple:p%61ss@ex%61mple.com/foob%61r?%61bc=%61bc#%61bc");
-callWhatWgGetters($url);
-
-?>
---EXPECT--
-string(4) "http"
-string(4) "http"
-string(5) "apple"
-string(7) "%61pple"
-string(4) "pass"
-string(6) "p%61ss"
-string(10) "apple:pass"
-string(14) "%61pple:p%61ss"
-string(11) "example.com"
-string(13) "ex%61mple.com"
-NULL
-string(7) "/foobar"
-string(9) "/foob%61r"
-string(7) "abc=abc"
-string(11) "%61bc=%61bc"
-string(3) "abc"
-string(5) "%61bc"
-
-string(4) "http"
-string(7) "%61pple"
-string(6) "p%61ss"
-string(11) "example.com"
-string(11) "example.com"
-NULL
-string(9) "/foob%61r"
-string(11) "%61bc=%61bc"
-string(5) "%61bc"
diff --git a/ext/uri/tests/040.phpt b/ext/uri/tests/040.phpt
deleted file mode 100644
index 2699de18e17f..000000000000
--- a/ext/uri/tests/040.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-Test HTTP URL validation
---FILE--
-<?php
-
-$uri = Uri\Rfc3986\Uri::parse("https:example.com");
-var_dump($uri);
-var_dump($uri->toRawString());
-
-$url = Uri\WhatWg\Url::parse("https:example.com");
-var_dump($url);
-var_dump($url->toAsciiString());
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(11) "example.com"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-string(17) "https:example.com"
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-string(20) "https://example.com/"
diff --git a/ext/uri/tests/041.phpt b/ext/uri/tests/041.phpt
deleted file mode 100644
index 59a8e3211f97..000000000000
--- a/ext/uri/tests/041.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-Test relative URI parsing
---FILE--
-<?php
-
-$uri = Uri\Rfc3986\Uri::parse("?query#fragment");
-var_dump($uri);
-
-$errors = [];
-$url = Uri\WhatWg\Url::parse("?query#fragment", null, $errors);
-var_dump($url);
-var_dump($errors);
-
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  NULL
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  string(5) "query"
-  ["fragment"]=>
-  string(8) "fragment"
-}
-NULL
-array(%d) {
-  [0]=>
-  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
-    ["context"]=>
-    string(15) "?query#fragment"
-    ["type"]=>
-    enum(Uri\WhatWg\UrlValidationErrorType::MissingSchemeNonRelativeUrl)
-    ["failure"]=>
-    bool(true)
-  }
-}
diff --git a/ext/uri/tests/042.phpt b/ext/uri/tests/042.phpt
deleted file mode 100644
index aadb9e5c192f..000000000000
--- a/ext/uri/tests/042.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-Test URN parsing
---FILE--
-<?php
-
-$uri = Uri\Rfc3986\Uri::parse("urn:uuid:6e8bc430-9c3a-11d9-9669-0800200c9a66");
-var_dump($uri);
-
-$url = Uri\WhatWg\Url::parse("urn:uuid:6e8bc430-9c3a-11d9-9669-0800200c9a66");
-var_dump($url);
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(3) "urn"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(41) "uuid:6e8bc430-9c3a-11d9-9669-0800200c9a66"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(3) "urn"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  NULL
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(41) "uuid:6e8bc430-9c3a-11d9-9669-0800200c9a66"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
diff --git a/ext/uri/tests/043.phpt b/ext/uri/tests/043.phpt
deleted file mode 100644
index 18c65e3c7735..000000000000
--- a/ext/uri/tests/043.phpt
+++ /dev/null
@@ -1,155 +0,0 @@
---TEST--
-Test reference resolution
---FILE--
-<?php
-
-$uri = Uri\Rfc3986\Uri::parse("https://example.com/without-base");
-var_dump($uri);
-
-$uri = Uri\Rfc3986\Uri::parse("/with-base", new Uri\Rfc3986\Uri("https://example.com"));
-var_dump($uri);
-
-$uri = Uri\Rfc3986\Uri::parse("https://test.com/with-base-in-vain", new Uri\Rfc3986\Uri("https://example.com"));
-var_dump($uri);
-
-$uri = Uri\Rfc3986\Uri::parse("HTTPS://TEST.com/with-base-in-vain", Uri\Rfc3986\Uri::parse("https://example.com"));
-var_dump($uri);
-var_dump($uri->toString());
-
-$url = Uri\WhatWg\Url::parse("https://example.com/without-base/");
-var_dump($url);
-
-$url = Uri\WhatWg\Url::parse("/with-base", new Uri\WhatWg\Url("https://example.com"));
-var_dump($url);
-
-$url = Uri\WhatWg\Url::parse("https://test.com/with-base-in-vain", Uri\WhatWg\Url::parse("https://example.com/"));
-var_dump($url);
-?>
---EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(13) "/without-base"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(10) "/with-base"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(8) "test.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(18) "/with-base-in-vain"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\Rfc3986\Uri)#%d (%d) {
-  ["scheme"]=>
-  string(5) "HTTPS"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(8) "TEST.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(18) "/with-base-in-vain"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-string(34) "https://test.com/with-base-in-vain"
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(14) "/without-base/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(10) "/with-base"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-object(Uri\WhatWg\Url)#%d (%d) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(8) "test.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(18) "/with-base-in-vain"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
diff --git a/ext/uri/tests/045.phpt b/ext/uri/tests/045.phpt
deleted file mode 100644
index f968716f9fcd..000000000000
--- a/ext/uri/tests/045.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-Test percent-decoding of reserved characters in the path
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("https://example.com/foo/bar%2Fbaz");
-
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$url = new Uri\Whatwg\Url("https://example.com/foo/bar%2Fbaz");
-
-var_dump($url->toAsciiString());
-var_dump($url->getPath());
-
-?>
---EXPECT--
-string(33) "https://example.com/foo/bar%2Fbaz"
-string(14) "/foo/bar%2Fbaz"
-string(14) "/foo/bar%2Fbaz"
-string(33) "https://example.com/foo/bar%2Fbaz"
-string(14) "/foo/bar%2Fbaz"
diff --git a/ext/uri/tests/046.phpt b/ext/uri/tests/046.phpt
deleted file mode 100644
index 10d56024698e..000000000000
--- a/ext/uri/tests/046.phpt
+++ /dev/null
@@ -1,87 +0,0 @@
---TEST--
-Test special path variants
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("mailto:johndoe@example.com");
-
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$uri = new Uri\Rfc3986\Uri("foo/bar");
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$uri = new Uri\Rfc3986\Uri("/foo/bar");
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$uri = new Uri\Rfc3986\Uri("//");
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$uri = new Uri\Rfc3986\Uri("///");
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$uri = new Uri\Rfc3986\Uri("https://example.com");
-
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$uri = new Uri\Rfc3986\Uri("https://example.com/");
-
-var_dump($uri->toRawString());
-var_dump($uri->getPath());
-var_dump($uri->getRawPath());
-
-$url = new Uri\Whatwg\Url("mailto:johndoe@example.com");
-
-var_dump($url->toAsciiString());
-var_dump($url->getPath());
-
-$url = new Uri\Whatwg\Url("https://example.com");
-
-var_dump($url->toAsciiString());
-var_dump($url->getPath());
-
-$url = new Uri\Whatwg\Url("https://example.com/");
-
-var_dump($url->toAsciiString());
-var_dump($url->getPath());
-
-?>
---EXPECT--
-string(26) "mailto:johndoe@example.com"
-string(19) "johndoe@example.com"
-string(19) "johndoe@example.com"
-string(7) "foo/bar"
-string(7) "foo/bar"
-string(7) "foo/bar"
-string(8) "/foo/bar"
-string(8) "/foo/bar"
-string(8) "/foo/bar"
-string(2) "//"
-string(0) ""
-string(0) ""
-string(3) "///"
-string(1) "/"
-string(1) "/"
-string(19) "https://example.com"
-string(0) ""
-string(0) ""
-string(20) "https://example.com/"
-string(1) "/"
-string(1) "/"
-string(26) "mailto:johndoe@example.com"
-string(19) "johndoe@example.com"
-string(20) "https://example.com/"
-string(1) "/"
-string(20) "https://example.com/"
-string(1) "/"
diff --git a/ext/uri/tests/047.phpt b/ext/uri/tests/047.phpt
deleted file mode 100644
index de9a21efd9b0..000000000000
--- a/ext/uri/tests/047.phpt
+++ /dev/null
@@ -1,55 +0,0 @@
---TEST--
-Test IP addresses
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("https://192.168.0.1");
-var_dump($uri->getRawHost());
-var_dump($uri->getHost());
-var_dump($uri->toRawString());
-var_dump($uri->toString());
-
-$uri = new Uri\Rfc3986\Uri("https://[2001:0db8:0001:0000:0000:0ab9:C0A8:0102]");
-var_dump($uri->getRawHost());
-var_dump($uri->getHost());
-var_dump($uri->toRawString());
-var_dump($uri->toString());
-
-$uri = new Uri\Rfc3986\Uri("//[v7.host]/source");
-var_dump($uri->getRawHost());
-var_dump($uri->getHost());
-var_dump($uri->toRawString());
-var_dump($uri->toString());
-
-$url = new Uri\WhatWg\Url("https://192.168.0.1");
-var_dump($url->getAsciiHost());
-var_dump($url->toAsciiString());
-
-$url = new Uri\WhatWg\Url("https://[2001:0db8:0001:0000:0000:0ab9:C0A8:0102]");
-var_dump($url->getAsciiHost());
-var_dump($url->toAsciiString());
-
-$url = new Uri\WhatWg\Url("https://[0:0::1]");
-var_dump($url->getAsciiHost());
-var_dump($url->toAsciiString());
-
-?>
---EXPECT--
-string(11) "192.168.0.1"
-string(11) "192.168.0.1"
-string(19) "https://192.168.0.1"
-string(19) "https://192.168.0.1"
-string(41) "[2001:0db8:0001:0000:0000:0ab9:C0A8:0102]"
-string(41) "[2001:0db8:0001:0000:0000:0ab9:c0a8:0102]"
-string(49) "https://[2001:0db8:0001:0000:0000:0ab9:c0a8:0102]"
-string(49) "https://[2001:0db8:0001:0000:0000:0ab9:c0a8:0102]"
-string(9) "[v7.host]"
-string(9) "[v7.host]"
-string(18) "//[v7.host]/source"
-string(18) "//[v7.host]/source"
-string(11) "192.168.0.1"
-string(20) "https://192.168.0.1/"
-string(26) "[2001:db8:1::ab9:c0a8:102]"
-string(35) "https://[2001:db8:1::ab9:c0a8:102]/"
-string(5) "[::1]"
-string(14) "https://[::1]/"
diff --git a/ext/uri/tests/049.phpt b/ext/uri/tests/049.phpt
deleted file mode 100644
index 48f27277fab0..000000000000
--- a/ext/uri/tests/049.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Test percent-encoding normalization - special case
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("https://example.com/foo/bar%2Fbaz");
-var_dump($uri->getRawPath());
-var_dump($uri->getPath());
-
-$url = new Uri\WhatWg\Url("https://example.com/foo/bar%2Fbaz");
-var_dump($url->getPath());
-
-?>
---EXPECT--
-string(14) "/foo/bar%2Fbaz"
-string(14) "/foo/bar%2Fbaz"
-string(14) "/foo/bar%2Fbaz"
diff --git a/ext/uri/tests/050.phpt b/ext/uri/tests/050.phpt
deleted file mode 100644
index 3bd4052fb80c..000000000000
--- a/ext/uri/tests/050.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Test resolve() method - success cases
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("https://example.com");
-
-var_dump($uri->resolve("/foo/")->toString());
-var_dump($uri->resolve("https://test.com/foo")->toString());
-
-$url = new Uri\WhatWg\Url("https://example.com");
-
-var_dump($url->resolve("/foo/")->toAsciiString());
-var_dump($url->resolve("https://test.com/foo")->toAsciiString());
-
-?>
---EXPECTF--
-string(24) "https://example.com/foo/"
-string(20) "https://test.com/foo"
-string(24) "https://example.com/foo/"
-string(20) "https://test.com/foo"
diff --git a/ext/uri/tests/051.phpt b/ext/uri/tests/051.phpt
deleted file mode 100644
index cb9c975d2385..000000000000
--- a/ext/uri/tests/051.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-Test resolve() method - error cases
---FILE--
-<?php
-
-$uri = new Uri\Rfc3986\Uri("https://example.com");
-
-try {
-    $uri->resolve("á");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$url = new Uri\WhatWg\Url("https://example.com");
-
-try {
-    $url->resolve("https://1.2.3.4.5");
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
-$softErrors = [];
-
-var_dump($url->resolve(" /foo", $softErrors)->toAsciiString());
-var_dump($softErrors);
-
-?>
---EXPECTF--
-Uri\InvalidUriException: The specified URI is malformed
-Uri\WhatWg\InvalidUrlException: The specified URI is malformed (Ipv4TooManyParts)
-string(23) "https://example.com/foo"
-array(%d) {
-  [0]=>
-  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
-    ["context"]=>
-    string(5) " /foo"
-    ["type"]=>
-    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
-    ["failure"]=>
-    bool(false)
-  }
-}
diff --git a/ext/uri/tests/065.phpt b/ext/uri/tests/065.phpt
deleted file mode 100644
index 2c84cceea3d4..000000000000
--- a/ext/uri/tests/065.phpt
+++ /dev/null
@@ -1,115 +0,0 @@
---TEST--
-Test that overwriting the URI is not possible
---FILE--
-<?php
-
-$uri = new Uri\WhatWg\Url('https://example.com');
-try {
-  $uri->__construct('ftp://example.org');
-} catch (Throwable $e) {
-  echo $e::class, ": ", $e->getMessage(), PHP_EOL;
-}
-var_dump($uri);
-
-$uri = new Uri\WhatWg\Url('https://example.com');
-try {
-  $uri->__unserialize([['uri' => 'ftp://example.org'], []]);
-} catch (Throwable $e) {
-  echo $e::class, ": ", $e->getMessage(), PHP_EOL;
-}
-var_dump($uri);
-
-$uri = new Uri\Rfc3986\Uri('https://example.com');
-try {
-  $uri->__construct('ftp://example.org');
-} catch (Throwable $e) {
-  echo $e::class, ": ", $e->getMessage(), PHP_EOL;
-}
-var_dump($uri);
-
-$uri = new Uri\Rfc3986\Uri('https://example.com');
-try {
-  $uri->__unserialize([['uri' => 'ftp://example.org'], []]);
-} catch (Throwable $e) {
-  echo $e::class, ": ", $e->getMessage(), PHP_EOL;
-}
-var_dump($uri);
-
-?>
---EXPECTF--
-Error: Cannot modify readonly object of class Uri\WhatWg\Url
-object(Uri\WhatWg\Url)#%d (8) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-Exception: Invalid serialization data for Uri\WhatWg\Url object
-object(Uri\WhatWg\Url)#%d (8) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(1) "/"
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-Error: Cannot modify readonly object of class Uri\Rfc3986\Uri
-object(Uri\Rfc3986\Uri)#%d (8) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
-Exception: Invalid serialization data for Uri\Rfc3986\Uri object
-object(Uri\Rfc3986\Uri)#%d (8) {
-  ["scheme"]=>
-  string(5) "https"
-  ["username"]=>
-  NULL
-  ["password"]=>
-  NULL
-  ["host"]=>
-  string(11) "example.com"
-  ["port"]=>
-  NULL
-  ["path"]=>
-  string(0) ""
-  ["query"]=>
-  NULL
-  ["fragment"]=>
-  NULL
-}
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 284de4e6a522..655f57700abc 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 @@ $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";
 }
 
 ?>
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 b7a84dc00cf1..f98f34a5981b 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 8ed2a8938e9a..97ec3d167cb2 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 @@ $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";
 }
 
 ?>
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 2a15d5e85a82..a87ef9f5d3b0 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 @@ $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";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_error_ipv6_closing_brace.phpt b/ext/uri/tests/rfc3986/builder/host_error_ipv6_closing_brace.phpt
index feda6170b38e..f03a8b680a70 100644
--- a/ext/uri/tests/rfc3986/builder/host_error_ipv6_closing_brace.phpt
+++ b/ext/uri/tests/rfc3986/builder/host_error_ipv6_closing_brace.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setHost("[2001:db8: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_error_percent_encoding1.phpt b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt
index ae06238a1f8f..7774bd4beb8e 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 @@ $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";
 }
 
 ?>
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 cc514ec69191..49f29269cff8 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 @@ $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";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_success_regname.phpt b/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
index 81e93ccfc10a..c7288893524f 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 8cce8d471aa1..c95e2ea14446 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 @@ $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";
 }
 
 ?>
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 b1f0a2518f1c..ede07bda8fc8 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 @@ $builder->setPath("//foo/bar/baz");
 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 97b6c3e8b854..7b0cd553ae15 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 @@ $builder->setHost("example.com");
 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 039b22770246..3831c67bde70 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 @@ $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";
 }
 
 ?>
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 4b40e84c78f3..a0d8a4c0c88b 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 @@ $builder->setPort(443);
 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 4cbc0e1c69d7..0a1dd624b449 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 @@ $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";
 }
 
 ?>
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 ecfced24a44c..d53b088b7a55 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 @@ $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";
 }
 
 ?>
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 4c212cddd631..c8c7f093c038 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 @@ $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";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt
index 13594c163363..dc325cc77a7b 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 @@ $builder = new Uri\Rfc3986\UriBuilder();
 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 c178a0fa1f1e..92719c129c30 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 @@ $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";
 }
 
 ?>
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 4941db44aa7d..1817af42edb3 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 @@ $builder = new Uri\Rfc3986\UriBuilder();
 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 a6919e8ffd0a..997ff84c6944 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 @@ $builder->setUserInfo("user:pass");
 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 0830a57864d7..53730dfe529d 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 @@ $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";
 }
 
 ?>
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 9d3fb2544daf..6db1fbb5ba6c 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 @@ $builder = new Uri\Rfc3986\UriBuilder();
 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/034.phpt b/ext/uri/tests/rfc3986/general/array_cast_success.phpt
similarity index 53%
rename from ext/uri/tests/034.phpt
rename to ext/uri/tests/rfc3986/general/array_cast_success.phpt
index 35d51aad8664..9bb133eba767 100644
--- a/ext/uri/tests/034.phpt
+++ b/ext/uri/tests/rfc3986/general/array_cast_success.phpt
@@ -1,17 +1,12 @@
 --TEST--
-Test array cast
+Test Uri\Rfc3986\Uri array cast - success
 --FILE--
 <?php
 
 $uri = new Uri\Rfc3986\Uri("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
 var_dump((array) $uri);
 
-$url = new Uri\WhatWg\Url("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-var_dump((array) $url);
-
 ?>
 --EXPECTF--
 array(%d) {
 }
-array(%d) {
-}
diff --git a/ext/uri/tests/rfc3986/general/clone_success.phpt b/ext/uri/tests/rfc3986/general/clone_success.phpt
new file mode 100644
index 000000000000..6539f0e02910
--- /dev/null
+++ b/ext/uri/tests/rfc3986/general/clone_success.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Test Uri\Rfc3986\Uri cloning - success
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
+$uri2 = clone $uri1;
+
+var_dump($uri1->toRawString());
+
+var_dump($uri2);
+var_dump($uri2->toRawString());
+var_dump($uri2->toString());
+
+?>
+--EXPECTF--
+string(19) "https://example.com"
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(19) "https://example.com"
+string(19) "https://example.com"
diff --git a/ext/uri/tests/rfc3986/general/constructor_error_reinitialization.phpt b/ext/uri/tests/rfc3986/general/constructor_error_reinitialization.phpt
new file mode 100644
index 000000000000..412d9e83ac17
--- /dev/null
+++ b/ext/uri/tests/rfc3986/general/constructor_error_reinitialization.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test Uri\Rfc3986\Uri __construct() - error - reinitialization
+--FILE--
+<?php
+
+$uri = new Uri\Rfc3986\Uri('https://example.com');
+
+try {
+    $uri->__construct('ftp://example.org');
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+Error: Cannot modify readonly object of class Uri\Rfc3986\Uri
+object(Uri\Rfc3986\Uri)#%d (8) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(19) "https://example.com"
+string(19) "https://example.com"
diff --git a/ext/uri/tests/021.phpt b/ext/uri/tests/rfc3986/general/extension_error.phpt
similarity index 82%
rename from ext/uri/tests/021.phpt
rename to ext/uri/tests/rfc3986/general/extension_error.phpt
index 02cc60ff0e24..94b2cc4f9572 100644
--- a/ext/uri/tests/021.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/015.phpt b/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
similarity index 51%
rename from ext/uri/tests/015.phpt
rename to ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
index e3a846f5e314..b2b4967f2200 100644
--- a/ext/uri/tests/015.phpt
+++ b/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test instantiation without calling constructor
+Test Uri\Rfc3986\Uri instantiation - error - without calling the constructor
 --EXTENSIONS--
 reflection
 uri
@@ -13,14 +13,6 @@ try {
     echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
-try {
-    $reflectionClass = new ReflectionClass(Uri\WhatWg\Url::class);
-    $reflectionClass->newInstanceWithoutConstructor();
-} catch (Throwable $e) {
-    echo $e::class, ': ', $e->getMessage(), "\n";
-}
-
 ?>
 --EXPECT--
 ReflectionException: Class Uri\Rfc3986\Uri is an internal class marked as final that cannot be instantiated without invoking its constructor
-ReflectionException: Class Uri\WhatWg\Url is an internal class marked as final that cannot be instantiated without invoking its constructor
diff --git a/ext/uri/tests/rfc3986/getters/basic_success_percent_encoded_components.phpt b/ext/uri/tests/rfc3986/getters/basic_success_percent_encoded_components.phpt
new file mode 100644
index 000000000000..e0df794c11b0
--- /dev/null
+++ b/ext/uri/tests/rfc3986/getters/basic_success_percent_encoded_components.phpt
@@ -0,0 +1,44 @@
+--TEST--
+Test Uri\Rfc3986\Uri component retrieval - basic - percent-encoded components
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("http://%61pple:p%61ss@ex%61mple.com/foob%61r?%61bc=%61bc#%61bc");
+
+var_dump($uri->getScheme());
+var_dump($uri->getRawScheme());
+var_dump($uri->getUsername());
+var_dump($uri->getRawUsername());
+var_dump($uri->getPassword());
+var_dump($uri->getRawPassword());
+var_dump($uri->getUserInfo());
+var_dump($uri->getRawUserInfo());
+var_dump($uri->getHost());
+var_dump($uri->getRawHost());
+var_dump($uri->getPort());
+var_dump($uri->getPath());
+var_dump($uri->getRawPath());
+var_dump($uri->getQuery());
+var_dump($uri->getRawQuery());
+var_dump($uri->getFragment());
+var_dump($uri->getRawFragment());
+
+?>
+--EXPECT--
+string(4) "http"
+string(4) "http"
+string(5) "apple"
+string(7) "%61pple"
+string(4) "pass"
+string(6) "p%61ss"
+string(10) "apple:pass"
+string(14) "%61pple:p%61ss"
+string(11) "example.com"
+string(13) "ex%61mple.com"
+NULL
+string(7) "/foobar"
+string(9) "/foob%61r"
+string(7) "abc=abc"
+string(11) "%61bc=%61bc"
+string(3) "abc"
+string(5) "%61bc"
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 0ac7ea3f7efd..c2edc849086c 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 2296a797e662..201ebe23ffbb 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 @@ $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";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
index 5caea7996c5f..18e0af52bbc7 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 @@ $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";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
index 2c6285656a7b..807ecc3afe24 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 905ed65f6666..ab55b8e4f537 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 4b5936880ff1..ebecce9ac565 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 9020a8f3669c..5d754f2c04f9 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 080b2ea9e1ba..966ebbbc3472 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 be724549926d..feeaa987f372 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 @@ $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";
 }
 
 ?>
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
new file mode 100644
index 000000000000..c5755dcc4f01
--- /dev/null
+++ b/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test Uri\Rfc3986\Uri::withHost() - error - unsetting with userinfo
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("ftp://user:pass@foo.com?query=abc#foo");
+
+try {
+    $uri->withHost(null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\InvalidUriException: Cannot remove the host from a URI that has a userinfo
diff --git a/ext/uri/tests/rfc3986/modification/host_success_empty.phpt b/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
index 98187ddee609..71d86c05f8bf 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 05bb410f44e0..eca764996183 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 385c29f985d5..b9bcdc498ed1 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 7969559d73a6..e1fae015afe8 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 7a2ef3702bc7..d146a842ad47 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
new file mode 100644
index 000000000000..a809c1cf135d
--- /dev/null
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Test Uri\Rfc3986\Uri::withHost() - success - changing IPv4 to IPv6
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://192.168.0.1");
+$uri2 = $uri1->withHost("[2001:0db8:3333:4444:5555:6666:7777:8888]");
+
+var_dump($uri1->getRawHost());
+
+var_dump($uri2->getRawHost());
+var_dump($uri2->toRawString());
+var_dump($uri2->getHost());
+var_dump($uri2->toString());
+
+?>
+--EXPECT--
+string(11) "192.168.0.1"
+string(41) "[2001:0db8:3333:4444:5555:6666:7777:8888]"
+string(49) "https://[2001:0db8:3333:4444:5555:6666:7777:8888]"
+string(41) "[2001:0db8:3333:4444:5555:6666:7777:8888]"
+string(49) "https://[2001:0db8:3333:4444:5555:6666:7777:8888]"
diff --git a/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt b/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
index 521e5645fe66..ac1856fd5ac6 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 f9d13de087fb..a387d4b14c75 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
new file mode 100644
index 000000000000..00777a64dd0b
--- /dev/null
+++ b/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Test Uri\Rfc3986\Uri::withHost() - success - percent-encoded reserved characters
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
+$uri2 = $uri1->withHost("t%3As%2Ft.com");
+
+var_dump($uri1->getRawHost());
+
+var_dump($uri2->getRawHost());
+var_dump($uri2->toRawString());
+var_dump($uri2->getHost());
+var_dump($uri2->toString());
+
+?>
+--EXPECT--
+string(11) "example.com"
+string(13) "t%3As%2Ft.com"
+string(21) "https://t%3As%2Ft.com"
+string(13) "t%3As%2Ft.com"
+string(21) "https://t%3As%2Ft.com"
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 f1887209d49e..8d6880703b9d 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 8eb5faeac72b..c9d23ec7399b 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 b629ec8fdd54..97fa180bee54 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 24863251f943..e539f6cefd06 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 1762470ee2a9..c86045ef3304 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 5ab98a5d449a..7b8f2a9c8ec2 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 0ff5a2dd1412..f13e1a4fe7ae 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 0f0b3216d3bd..bae19eda1974 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 536df32ee86c..d3d76465b4a1 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 13ec3b5d07c9..76bd8b76d153 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
new file mode 100644
index 000000000000..c1d0a8fe9b48
--- /dev/null
+++ b/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test Uri\Rfc3986\Uri::withPort() - error - missing host
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("/foo");
+
+try {
+    $uri->withPort(1);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\InvalidUriException: Cannot set a port without having a host
diff --git a/ext/uri/tests/rfc3986/modification/port_error_negative.phpt b/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
index 250e01105b5c..74d370433d91 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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
new file mode 100644
index 000000000000..09aebc4d90f2
--- /dev/null
+++ b/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test Uri\Rfc3986\Uri::withPort() - success - adding with an empty host
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("file:///foo/bar");
+$uri2 = $uri1->withPort(80);
+
+var_dump($uri1->getPort());
+
+var_dump($uri2->getPort());
+var_dump($uri2->toRawString());
+
+?>
+--EXPECT--
+NULL
+int(80)
+string(18) "file://:80/foo/bar"
diff --git a/ext/uri/tests/rfc3986/modification/port_success_existing.phpt b/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
index d3a3d1c7a010..38a1326f8f4b 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 ce1ebfdca5d2..af973e3dd104 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 6610e75ebc40..2ec5c504408d 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 2c7f14aae781..9bfe494b33b3 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
new file mode 100644
index 000000000000..201a6f5b0a20
--- /dev/null
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test Uri\Rfc3986\Uri::withPort() - success - unsetting with an empty host
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse('https://:80/foo/bar');
+$uri2 = $uri1->withPort(null);
+
+var_dump($uri1->getPort());
+
+var_dump($uri2->getPort());
+var_dump($uri2->toRawString());
+
+?>
+--EXPECT--
+int(80)
+NULL
+string(16) "https:///foo/bar"
diff --git a/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
index 24c7b36c4378..b3e766313381 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 5474792e39dd..3aa0858174ee 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 437c00d7278e..a54b2f7288d0 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 44f7ebc42d8a..09bb7fe3cb91 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 1fc9049388cc..db73639f6b61 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 de1d67f04d28..56f3bdb76a0f 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 0b3b62a29f79..ff00a7c4e810 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 129e4ca680c3..aaa4f0126039 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 5ef568415775..57f7f3b44b36 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 9e5551ee439a..141932a28d18 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 89ae3c0b608b..56c12fe7e810 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 b737f94bec7f..18f7c48291c9 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 7b6d179fdc9d..092a5eb55403 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 beb94baf955c..b55ddd7fffea 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 d50b76e085d1..7ca0de00f665 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 7cf806f7b2bd..896e8c38f5ed 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 b2817a61f2a9..5ce37f79fba0 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 2db4f37c2e03..369938e8b949 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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 0d494c6a60a3..03848c4e2811 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 61f6ee9d41b4..167049803460 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 cc4d4998aca9..443dd8635940 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 1937c4eba01e..e148c2bc9259 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 1f625d93f762..f006729ec995 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 13f65e514514..8f164e5e28a9 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/048.phpt b/ext/uri/tests/rfc3986/normalization/percent_encoding.phpt
similarity index 90%
rename from ext/uri/tests/048.phpt
rename to ext/uri/tests/rfc3986/normalization/percent_encoding.phpt
index ee7a396f1796..f2ddb1d345e3 100644
--- a/ext/uri/tests/048.phpt
+++ b/ext/uri/tests/rfc3986/normalization/percent_encoding.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test RFC 3986 percent-encoding normalization
+Test Uri\Rfc3986\Uri normalization - percent-encoding
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_emoji_relative_reference_returns_null.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_emoji_relative_reference_returns_null.phpt
new file mode 100644
index 000000000000..2226c55b35c8
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/basic_error_emoji_relative_reference_returns_null.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - basic - parse() returns null for an emoji relative reference
+--FILE--
+<?php
+
+var_dump(Uri\Rfc3986\Uri::parse("🐘"));
+
+?>
+--EXPECT--
+NULL
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_invalid_uris_return_null.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_invalid_uris_return_null.phpt
new file mode 100644
index 000000000000..1e8e95fa5f72
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/basic_error_invalid_uris_return_null.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - basic - parse() returns null for invalid URIs
+--FILE--
+<?php
+
+var_dump(Uri\Rfc3986\Uri::parse(':'));
+var_dump(Uri\Rfc3986\Uri::parse("https://你好你好"));
+var_dump(Uri\Rfc3986\Uri::parse("https://０Ｘｃ０．０２５０．０１"));
+
+?>
+--EXPECT--
+NULL
+NULL
+NULL
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
index cb6007c844aa..081081c805f4 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 @@ Test Uri\Rfc3986\Uri parsing - basic - multibyte character
 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 91d194e2ff5e..3209eec4cb8c 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 @@ Test Uri\Rfc3986\Uri parsing - basic - URI contains null byte
 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/055.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_relative_base.phpt
similarity index 77%
rename from ext/uri/tests/055.phpt
rename to ext/uri/tests/rfc3986/parsing/basic_error_relative_base.phpt
index fddb313149df..dcbf41dc52c1 100644
--- a/ext/uri/tests/055.phpt
+++ b/ext/uri/tests/rfc3986/parsing/basic_error_relative_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test InvalidUrlException constructor error handling
+Test Uri\Rfc3986\Uri parsing - basic - base URI is a relative reference
 --FILE--
 <?php
 
@@ -8,6 +8,7 @@ try {
 } catch (Throwable $e) {
     echo $e::class, ': ', $e->getMessage(), "\n";
 }
+
 ?>
 --EXPECT--
 Uri\InvalidUriException: The specified base URI must be absolute
diff --git a/ext/uri/tests/rfc3986/parsing/basic_success_constructor.phpt b/ext/uri/tests/rfc3986/parsing/basic_success_constructor.phpt
new file mode 100644
index 000000000000..109777ba533d
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/basic_success_constructor.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - basic - parsing all components with the constructor
+--FILE--
+<?php
+
+$uri = new Uri\Rfc3986\Uri("https://username:password@example.com:8080/path?q=r#fragment");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  string(8) "username"
+  ["password"]=>
+  string(8) "password"
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  int(8080)
+  ["path"]=>
+  string(5) "/path"
+  ["query"]=>
+  string(3) "q=r"
+  ["fragment"]=>
+  string(8) "fragment"
+}
+string(60) "https://username:password@example.com:8080/path?q=r#fragment"
+string(60) "https://username:password@example.com:8080/path?q=r#fragment"
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
index d901d0fdecbd..4d5d2efb97a3 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 @@ Test Uri\Rfc3986\Uri parsing - host - multibyte character
 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
new file mode 100644
index 000000000000..dc3331ecc67e
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - host - emoji character
+--FILE--
+<?php
+
+var_dump(Uri\Rfc3986\Uri::parse("https://🐘.com"));
+
+?>
+--EXPECT--
+NULL
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
index 0568a027f5b9..01f041c188fd 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 @@ Test Uri\Rfc3986\Uri parsing - host - reserved character
 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/host_success_empty_network_path_reference.phpt b/ext/uri/tests/rfc3986/parsing/host_success_empty_network_path_reference.phpt
new file mode 100644
index 000000000000..dd0856784d0f
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/host_success_empty_network_path_reference.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - host - empty in a network-path reference
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("///foo/");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(0) ""
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(5) "/foo/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(7) "///foo/"
+string(7) "///foo/"
diff --git a/ext/uri/tests/rfc3986/parsing/host_success_ipv4_octal_like_registered_name.phpt b/ext/uri/tests/rfc3986/parsing/host_success_ipv4_octal_like_registered_name.phpt
new file mode 100644
index 000000000000..02dd4db36592
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/host_success_ipv4_octal_like_registered_name.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - host - octal-like registered name
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("https://0300.0250.0000.0001");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+var_dump($uri->getHostType());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(19) "0300.0250.0000.0001"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(27) "https://0300.0250.0000.0001"
+string(27) "https://0300.0250.0000.0001"
+enum(Uri\Rfc3986\UriHostType::RegisteredName)
diff --git a/ext/uri/tests/rfc3986/parsing/host_success_ipvfuture_relative_reference.phpt b/ext/uri/tests/rfc3986/parsing/host_success_ipvfuture_relative_reference.phpt
new file mode 100644
index 000000000000..4fa50788d408
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/host_success_ipvfuture_relative_reference.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - host - IPvFuture in a relative reference
+--FILE--
+<?php
+
+$uri = new Uri\Rfc3986\Uri("//[v7.host]/source");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(9) "[v7.host]"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(7) "/source"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(18) "//[v7.host]/source"
+string(18) "//[v7.host]/source"
diff --git a/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
index ded528d03082..3eb651bdeff3 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 @@ Test Uri\Rfc3986\Uri parsing - path - multibyte character
 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 2a7efd702569..398bfd6400c3 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 @@ Test Uri\Rfc3986\Uri parsing - path - reserved character
 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/path_success_multiple_leading_slashes.phpt b/ext/uri/tests/rfc3986/parsing/path_success_multiple_leading_slashes.phpt
new file mode 100644
index 000000000000..f814a0582b05
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/path_success_multiple_leading_slashes.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - path - multiple leading slashes after an empty authority
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("http://////www.EXAMPLE.com:80");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(0) ""
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(22) "////www.EXAMPLE.com:80"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(29) "http://////www.EXAMPLE.com:80"
+string(29) "http://////www.EXAMPLE.com:80"
diff --git a/ext/uri/tests/rfc3986/parsing/path_success_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/path_success_percent_encoded.phpt
new file mode 100644
index 000000000000..1ebbb9a0ae00
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/path_success_percent_encoded.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - path - percent-encoded slash character
+--FILE--
+<?php
+
+$uri = new Uri\Rfc3986\Uri("https://example.com/foo/bar%2Fbaz");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(14) "/foo/bar%2Fbaz"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(33) "https://example.com/foo/bar%2Fbaz"
+string(33) "https://example.com/foo/bar%2Fbaz"
diff --git a/ext/uri/tests/rfc3986/parsing/path_success_relative_reference_network.phpt b/ext/uri/tests/rfc3986/parsing/path_success_relative_reference_network.phpt
new file mode 100644
index 000000000000..8aa2abe07d91
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/path_success_relative_reference_network.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - path - network-path reference
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("//host123/");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(7) "host123"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(10) "//host123/"
+string(10) "//host123/"
diff --git a/ext/uri/tests/rfc3986/parsing/path_success_relative_reference_numeric.phpt b/ext/uri/tests/rfc3986/parsing/path_success_relative_reference_numeric.phpt
new file mode 100644
index 000000000000..ead4a0061e83
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/path_success_relative_reference_numeric.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - path - numeric relative reference
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("192.168/contact.html");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  NULL
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(20) "192.168/contact.html"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "192.168/contact.html"
+string(20) "192.168/contact.html"
diff --git a/ext/uri/tests/rfc3986/parsing/path_success_special_chars.phpt b/ext/uri/tests/rfc3986/parsing/path_success_special_chars.phpt
new file mode 100644
index 000000000000..ecf9ab5c7494
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/path_success_special_chars.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - path - special characters
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("/foo:1@&+=");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  NULL
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(10) "/foo:1@&+="
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(10) "/foo:1@&+="
+string(10) "/foo:1@&+="
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
index 54bcd849e5f3..33eb4116c155 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 @@ Test Uri\Rfc3986\Uri parsing - port - multibyte character
 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 df29c2767f05..1284ac845bf4 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 @@ Test Uri\Rfc3986\Uri parsing - port - negative value
 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/058.phpt b/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
similarity index 67%
rename from ext/uri/tests/058.phpt
rename to ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
index c1ceaa1e02e5..b4d412bc7c25 100644
--- a/ext/uri/tests/058.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test that integer overflows in the port are rejected
+Test Uri\Rfc3986\Uri parsing - port - integer overflow
 --FILE--
 <?php
 
 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 {
@@ -20,7 +20,7 @@ try {
         new \Uri\Rfc3986\Uri('https://example.com:2147483648');
     }
 } 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_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
index e38ad85b5758..caa5b1982735 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 d2632a6f2806..26dd223d2123 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 @@ Test Uri\Rfc3986\Uri parsing - port - user info component is in wrong place
 try {
     var_dump(new Uri\Rfc3986\Uri("https://example.com:8080@username:password"));
 } catch (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.phpt b/ext/uri/tests/rfc3986/parsing/query_error_multibyte.phpt
new file mode 100644
index 000000000000..4f4509337885
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/query_error_multibyte.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - query - multibyte character
+--FILE--
+<?php
+
+var_dump(Uri\Rfc3986\Uri::parse("http://example.com?foo=Helló Wörld"));
+
+?>
+--EXPECT--
+NULL
diff --git a/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt b/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
new file mode 100644
index 000000000000..5114bce99f72
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - query - emoji character
+--FILE--
+<?php
+
+var_dump(Uri\Rfc3986\Uri::parse("https://example.com?🐘=🐘"));
+
+?>
+--EXPECT--
+NULL
diff --git a/ext/uri/tests/rfc3986/parsing/query_error_special.phpt b/ext/uri/tests/rfc3986/parsing/query_error_special.phpt
new file mode 100644
index 000000000000..5bec22c030de
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/query_error_special.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - query - special characters
+--FILE--
+<?php
+
+var_dump(Uri\Rfc3986\Uri::parse("http://example.com?foobar='<script> + @"));
+
+?>
+--EXPECT--
+NULL
diff --git a/ext/uri/tests/rfc3986/parsing/query_success_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/query_success_percent_encoded.phpt
new file mode 100644
index 000000000000..fb68f5079282
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/query_success_percent_encoded.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - query - percent-encoded bytes
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("http://example.com?foo=Hell%C3%B3+W%C3%B6rld");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  string(25) "foo=Hell%C3%B3+W%C3%B6rld"
+  ["fragment"]=>
+  NULL
+}
+string(44) "http://example.com?foo=Hell%C3%B3+W%C3%B6rld"
+string(44) "http://example.com?foo=Hell%C3%B3+W%C3%B6rld"
diff --git a/ext/uri/tests/rfc3986/parsing/query_success_percent_encoded_special.phpt b/ext/uri/tests/rfc3986/parsing/query_success_percent_encoded_special.phpt
new file mode 100644
index 000000000000..f3159286b533
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/query_success_percent_encoded_special.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - query - percent-encoded special characters
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("http://example.com?foobar=%27%3Cscript%3E+%2B+%40");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  string(30) "foobar=%27%3Cscript%3E+%2B+%40"
+  ["fragment"]=>
+  NULL
+}
+string(49) "http://example.com?foobar=%27%3Cscript%3E+%2B+%40"
+string(49) "http://example.com?foobar=%27%3Cscript%3E+%2B+%40"
diff --git a/ext/uri/tests/rfc3986/parsing/query_success_plus.phpt b/ext/uri/tests/rfc3986/parsing/query_success_plus.phpt
new file mode 100644
index 000000000000..f70976dd9548
--- /dev/null
+++ b/ext/uri/tests/rfc3986/parsing/query_success_plus.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri parsing - query - plus character
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("http://example.com?foo=foo+bar");
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  string(11) "foo=foo+bar"
+  ["fragment"]=>
+  NULL
+}
+string(30) "http://example.com?foo=foo+bar"
+string(30) "http://example.com?foo=foo+bar"
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
index ba686e7fafca..f2b7f93613b3 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 @@ Test Uri\Rfc3986\Uri parsing - scheme - empty
 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 f638ca80e0cd..4972bdeada13 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 @@ Test Uri\Rfc3986\Uri parsing - scheme - multibyte characters
 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 d4dba6f260ad..80a8be51c480 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 99dfb664ea05..ce7eed6ae789 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 @@ Test Uri\Rfc3986\Uri parsing - scheme - reserved character
 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 61ea8ecc3c28..bf12a200e1ce 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 @@ Test Uri\Rfc3986\Uri parsing - userinfo - extended ASCII character
 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 fbceea77b1cd..8d83d632a3a1 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 @@ Test Uri\Rfc3986\Uri parsing - userinfo - multibyte character
 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 3b6caeb7a0ed..e505d4a7d310 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 @@ Test Uri\Rfc3986\Uri parsing - userinfo - reserved character
 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_uri_with_base.phpt b/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
new file mode 100644
index 000000000000..789421862b21
--- /dev/null
+++ b/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri::parse() - success - absolute URI with base URI
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("https://test.com/with-base-in-vain", new Uri\Rfc3986\Uri("https://example.com"));
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(8) "test.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(18) "/with-base-in-vain"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(34) "https://test.com/with-base-in-vain"
+string(34) "https://test.com/with-base-in-vain"
diff --git a/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt b/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
new file mode 100644
index 000000000000..ee1aa3132d21
--- /dev/null
+++ b/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\Uri::parse() - success - relative reference with base URI
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("/with-base", new Uri\Rfc3986\Uri("https://example.com"));
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(10) "/with-base"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(29) "https://example.com/with-base"
+string(29) "https://example.com/with-base"
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 26f55896c1be..a5a6d7da2997 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 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 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_path_unicode_character.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
new file mode 100644
index 000000000000..26bbffbd0b5a
--- /dev/null
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test Uri\Rfc3986\Uri::resolve() - error - Unicode character in path
+--FILE--
+<?php
+
+$uri = new Uri\Rfc3986\Uri("https://example.com");
+
+try {
+    $uri->resolve("á");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\InvalidUriException: The specified URI is malformed
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
new file mode 100644
index 000000000000..26e2ecb4a64f
--- /dev/null
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Test Uri\Rfc3986\Uri::resolve() - success - absolute URI
+--FILE--
+<?php
+
+$uri1 = new Uri\Rfc3986\Uri("https://example.com");
+$uri2 = $uri1->resolve("https://test.com/foo");
+
+var_dump($uri1->toRawString());
+
+var_dump($uri2);
+var_dump($uri2->toRawString());
+var_dump($uri2->toString());
+
+?>
+--EXPECTF--
+string(19) "https://example.com"
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(8) "test.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(4) "/foo"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://test.com/foo"
+string(20) "https://test.com/foo"
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
new file mode 100644
index 000000000000..908d8fc7d340
--- /dev/null
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Test Uri\Rfc3986\Uri::resolve() - success - relative reference
+--FILE--
+<?php
+
+$uri1 = new Uri\Rfc3986\Uri("https://example.com");
+$uri2 = $uri1->resolve("/foo/");
+
+var_dump($uri1->toRawString());
+
+var_dump($uri2);
+var_dump($uri2->toRawString());
+var_dump($uri2->toString());
+
+?>
+--EXPECTF--
+string(19) "https://example.com"
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(5) "/foo/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(24) "https://example.com/foo/"
+string(24) "https://example.com/foo/"
diff --git a/ext/uri/tests/rfc3986/serialization/basic_success.phpt b/ext/uri/tests/rfc3986/serialization/basic_success.phpt
new file mode 100644
index 000000000000..8b246aab0caa
--- /dev/null
+++ b/ext/uri/tests/rfc3986/serialization/basic_success.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test Uri\Rfc3986\Uri serialization and unserialization - success
+--FILE--
+<?php
+
+$uri1 = new Uri\Rfc3986\Uri(
+    "https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists"
+);
+
+$serializedUri1 = serialize($uri1);
+var_dump($serializedUri1);
+
+$uri2 = unserialize($serializedUri1);
+var_dump($uri2);
+var_dump($uri2->toRawString());
+var_dump($uri2->toString());
+
+?>
+--EXPECTF--
+string(164) "O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:99:"https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists";}i:1;a:0:{}}"
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  string(8) "username"
+  ["password"]=>
+  string(8) "password"
+  ["host"]=>
+  string(15) "www.example.com"
+  ["port"]=>
+  int(8080)
+  ["path"]=>
+  string(30) "/pathname1/pathname2/pathname3"
+  ["query"]=>
+  string(10) "query=true"
+  ["fragment"]=>
+  string(11) "hash-exists"
+}
+string(99) "https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists"
+string(99) "https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists"
diff --git a/ext/uri/tests/032.phpt b/ext/uri/tests/rfc3986/serialization/json_encode_success.phpt
similarity index 52%
rename from ext/uri/tests/032.phpt
rename to ext/uri/tests/rfc3986/serialization/json_encode_success.phpt
index b17765240c7b..a0521ab6b3c4 100644
--- a/ext/uri/tests/032.phpt
+++ b/ext/uri/tests/rfc3986/serialization/json_encode_success.phpt
@@ -1,15 +1,11 @@
 --TEST--
-Test JSON encoding
+Test Uri\Rfc3986\Uri json_encode() - success
 --FILE--
 <?php
 
 $uri = new Uri\Rfc3986\Uri("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
 var_dump(json_encode($uri));
 
-$url = new Uri\WhatWg\Url("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
-var_dump(json_encode($url));
-
 ?>
 --EXPECT--
 string(2) "{}"
-string(2) "{}"
diff --git a/ext/uri/tests/rfc3986/serialization/unserialize_error_invalid_data.phpt b/ext/uri/tests/rfc3986/serialization/unserialize_error_invalid_data.phpt
new file mode 100644
index 000000000000..0121b0b961f5
--- /dev/null
+++ b/ext/uri/tests/rfc3986/serialization/unserialize_error_invalid_data.phpt
@@ -0,0 +1,63 @@
+--TEST--
+Test Uri\Rfc3986\Uri unserialize() - error - invalid data
+--FILE--
+<?php
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":1:{i:0;a:0:{}}'); // less than 2 items
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":3:{i:0;a:0:{}i:1;a:0:{}i:2;a:0:{}}'); // more than 2 items
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;N;i:1;a:0:{}}'); // first item is not an array
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:0:{}i:1;a:0:{}}'); // first array is empty
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";i:1;}i:1;a:0:{}}'); // "uri" key in first array is not a string
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:2:"%1";}i:1;a:0:{}}'); // "uri" key in first array contains invalid URI
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:4:"/uri";}i:1;s:0:"";}'); // second item in not an array
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:15:"Uri\Rfc3986\Uri":2:{i:0;a:1:{s:3:"uri";s:4:"/uri";}i:1;a:1:{s:5:"prop1";i:123;}}'); // second array contains a property
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
diff --git a/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt b/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
new file mode 100644
index 000000000000..c8cfabf022d1
--- /dev/null
+++ b/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Test Uri\Rfc3986\Uri unserialize() - error - unsupported C format
+--FILE--
+<?php
+
+unserialize('C:15:"Uri\Rfc3986\Uri":0:{}');
+?>
+--EXPECTF--
+Warning: Class Uri\Rfc3986\Uri has no unserializer in %s on line %d
+
+Warning: unserialize(): Error at offset 26 of 27 bytes in %s on line %d
diff --git a/ext/uri/tests/rfc3986/serialization/unserialize_error_reinitialization.phpt b/ext/uri/tests/rfc3986/serialization/unserialize_error_reinitialization.phpt
new file mode 100644
index 000000000000..14263afce9fe
--- /dev/null
+++ b/ext/uri/tests/rfc3986/serialization/unserialize_error_reinitialization.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test Uri\Rfc3986\Uri __unserialize() - error - reinitialization
+--FILE--
+<?php
+
+$uri = new Uri\Rfc3986\Uri('https://example.com');
+
+try {
+  $uri->__unserialize([['uri' => 'ftp://example.org'], []]);
+} catch (Throwable $e) {
+  echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+var_dump($uri);
+var_dump($uri->toRawString());
+var_dump($uri->toString());
+
+?>
+--EXPECTF--
+Exception: Invalid serialization data for Uri\Rfc3986\Uri object
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(19) "https://example.com"
+string(19) "https://example.com"
diff --git a/ext/uri/tests/whatwg/builder/basic_error_with_base.phpt b/ext/uri/tests/whatwg/builder/basic_error_with_base.phpt
index 6f65cdacdb4a..8fc06a2f8d98 100644
--- a/ext/uri/tests/whatwg/builder/basic_error_with_base.phpt
+++ b/ext/uri/tests/whatwg/builder/basic_error_with_base.phpt
@@ -9,7 +9,7 @@ $builder->setPath("/foo/bar/baz");
 try {
     $builder->build(new Uri\WhatWg\Url("/foo/bar"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/builder/host_error_ipv6_closing_brace_opaque.phpt b/ext/uri/tests/whatwg/builder/host_error_ipv6_closing_brace_opaque.phpt
index 7f3fbb35da63..53f905692c6c 100644
--- a/ext/uri/tests/whatwg/builder/host_error_ipv6_closing_brace_opaque.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_ipv6_closing_brace_opaque.phpt
@@ -9,7 +9,7 @@ $builder->setScheme("scheme");
 try {
     $builder->setHost("[2001:db8: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/whatwg/builder/host_error_ipv6_closing_brace_special.phpt b/ext/uri/tests/whatwg/builder/host_error_ipv6_closing_brace_special.phpt
index 94ba827ca325..b442d8882152 100644
--- a/ext/uri/tests/whatwg/builder/host_error_ipv6_closing_brace_special.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_ipv6_closing_brace_special.phpt
@@ -9,7 +9,7 @@ $builder->setScheme("https");
 try {
     $builder->setHost("[2001:%30db8: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/whatwg/builder/host_error_null_special.phpt b/ext/uri/tests/whatwg/builder/host_error_null_special.phpt
index 973f4ef9aca3..e9abda112c2b 100644
--- a/ext/uri/tests/whatwg/builder/host_error_null_special.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_null_special.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::setHost() - success - null in case of special URLs
+Test Uri\WhatWg\UrlBuilder::setHost() - error - null in case of special URLs
 --FILE--
 <?php
 
@@ -10,7 +10,7 @@ $builder->setHost(null);
 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/whatwg/builder/host_error_percent_encoding1.phpt b/ext/uri/tests/whatwg/builder/host_error_percent_encoding1.phpt
index 2dc8c76189fd..e90371744e64 100644
--- a/ext/uri/tests/whatwg/builder/host_error_percent_encoding1.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_percent_encoding1.phpt
@@ -10,7 +10,7 @@ $builder->setHost("ex%3mple.co");
 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/whatwg/builder/host_error_percent_encoding2.phpt b/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt
index 90a228ded22b..1c379f5ddd11 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
 
@@ -9,7 +9,7 @@ $builder->setScheme("https");
 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/whatwg/builder/host_error_percent_encoding3.phpt b/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt
index aee9f95d1f44..154b9dfc918c 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
 
@@ -10,7 +10,7 @@ $builder->setHost("192.168.%8.1");
 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/whatwg/builder/host_success_regname.phpt b/ext/uri/tests/whatwg/builder/host_success_regname.phpt
index d72b919c0afb..d8a2465c0bb3 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/builder/password_error_empty_opaque_host.phpt b/ext/uri/tests/whatwg/builder/password_error_empty_opaque_host.phpt
index 5c79856b93c9..831ff446f783 100644
--- a/ext/uri/tests/whatwg/builder/password_error_empty_opaque_host.phpt
+++ b/ext/uri/tests/whatwg/builder/password_error_empty_opaque_host.phpt
@@ -11,7 +11,7 @@ $builder->setPassword("password");
 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/whatwg/builder/password_error_file_scheme.phpt b/ext/uri/tests/whatwg/builder/password_error_file_scheme.phpt
index e6f4f993c4d2..f4349ef384d9 100644
--- a/ext/uri/tests/whatwg/builder/password_error_file_scheme.phpt
+++ b/ext/uri/tests/whatwg/builder/password_error_file_scheme.phpt
@@ -11,7 +11,7 @@ $builder->setPassword("password");
 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/whatwg/builder/password_error_missing_host.phpt b/ext/uri/tests/whatwg/builder/password_error_missing_host.phpt
index 9b3ba0876336..482612573e55 100644
--- a/ext/uri/tests/whatwg/builder/password_error_missing_host.phpt
+++ b/ext/uri/tests/whatwg/builder/password_error_missing_host.phpt
@@ -10,7 +10,7 @@ $builder->setPassword("pass");
 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/whatwg/builder/password_error_missing_opaque_host.phpt b/ext/uri/tests/whatwg/builder/password_error_missing_opaque_host.phpt
index efc14b06a413..cbe09fcbefef 100644
--- a/ext/uri/tests/whatwg/builder/password_error_missing_opaque_host.phpt
+++ b/ext/uri/tests/whatwg/builder/password_error_missing_opaque_host.phpt
@@ -10,7 +10,7 @@ $builder->setPassword("password");
 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/whatwg/builder/port_error_empty_opaque_host.phpt b/ext/uri/tests/whatwg/builder/port_error_empty_opaque_host.phpt
index acf82a1a12cb..b1a8e0d86e30 100644
--- a/ext/uri/tests/whatwg/builder/port_error_empty_opaque_host.phpt
+++ b/ext/uri/tests/whatwg/builder/port_error_empty_opaque_host.phpt
@@ -11,7 +11,7 @@ $builder->setPort(443);
 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/whatwg/builder/port_error_file_scheme.phpt b/ext/uri/tests/whatwg/builder/port_error_file_scheme.phpt
index 08559dbfd208..c514beb71b29 100644
--- a/ext/uri/tests/whatwg/builder/port_error_file_scheme.phpt
+++ b/ext/uri/tests/whatwg/builder/port_error_file_scheme.phpt
@@ -11,7 +11,7 @@ $builder->setPort(443);
 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/whatwg/builder/port_error_file_with_host_and_port.phpt b/ext/uri/tests/whatwg/builder/port_error_file_with_host_and_port.phpt
index 9e4e17ca3ae3..b5f3131b0b7a 100644
--- a/ext/uri/tests/whatwg/builder/port_error_file_with_host_and_port.phpt
+++ b/ext/uri/tests/whatwg/builder/port_error_file_with_host_and_port.phpt
@@ -11,7 +11,7 @@ $builder->setPort(123);
 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/whatwg/builder/port_error_large.phpt b/ext/uri/tests/whatwg/builder/port_error_large.phpt
index 46e80e1689b7..38f626a9e359 100644
--- a/ext/uri/tests/whatwg/builder/port_error_large.phpt
+++ b/ext/uri/tests/whatwg/builder/port_error_large.phpt
@@ -13,7 +13,7 @@ try {
     */
     $builder->setPort(PHP_INT_MAX);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/builder/port_error_missing_opaque_host.phpt b/ext/uri/tests/whatwg/builder/port_error_missing_opaque_host.phpt
index 3130b27cfcb7..4e3e42188d4e 100644
--- a/ext/uri/tests/whatwg/builder/port_error_missing_opaque_host.phpt
+++ b/ext/uri/tests/whatwg/builder/port_error_missing_opaque_host.phpt
@@ -10,7 +10,7 @@ $builder->setPort(443);
 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/whatwg/builder/port_error_negative.phpt b/ext/uri/tests/whatwg/builder/port_error_negative.phpt
index a1a723f43ca5..0b7dd7e67b9a 100644
--- a/ext/uri/tests/whatwg/builder/port_error_negative.phpt
+++ b/ext/uri/tests/whatwg/builder/port_error_negative.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\WhatWg\UrlBuilder();
 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/whatwg/builder/scheme_error_c0_control_space_char.phpt b/ext/uri/tests/whatwg/builder/scheme_error_c0_control_space_char.phpt
index 285e91132469..e1980ee4d536 100644
--- a/ext/uri/tests/whatwg/builder/scheme_error_c0_control_space_char.phpt
+++ b/ext/uri/tests/whatwg/builder/scheme_error_c0_control_space_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\WhatWg\UrlBuilder();
 try {
     $builder->setScheme(" \x01https \x02");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/builder/scheme_error_empty.phpt b/ext/uri/tests/whatwg/builder/scheme_error_empty.phpt
index f4090a9c4aac..7b5d5b7fa1a1 100644
--- a/ext/uri/tests/whatwg/builder/scheme_error_empty.phpt
+++ b/ext/uri/tests/whatwg/builder/scheme_error_empty.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\WhatWg\UrlBuilder();
 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/whatwg/builder/scheme_error_first_char.phpt b/ext/uri/tests/whatwg/builder/scheme_error_first_char.phpt
index 34a70c043aa3..d791ecb599be 100644
--- a/ext/uri/tests/whatwg/builder/scheme_error_first_char.phpt
+++ b/ext/uri/tests/whatwg/builder/scheme_error_first_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\WhatWg\UrlBuilder();
 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/whatwg/builder/scheme_error_special_char.phpt b/ext/uri/tests/whatwg/builder/scheme_error_special_char.phpt
index c37abc1ebb7c..c5bd82e6d6b1 100644
--- a/ext/uri/tests/whatwg/builder/scheme_error_special_char.phpt
+++ b/ext/uri/tests/whatwg/builder/scheme_error_special_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\WhatWg\UrlBuilder();
 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/whatwg/builder/username_error_empty_opaque_host.phpt b/ext/uri/tests/whatwg/builder/username_error_empty_opaque_host.phpt
index c97ffd49afad..fa63c5a3aa32 100644
--- a/ext/uri/tests/whatwg/builder/username_error_empty_opaque_host.phpt
+++ b/ext/uri/tests/whatwg/builder/username_error_empty_opaque_host.phpt
@@ -11,7 +11,7 @@ $builder->setUsername("user");
 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/whatwg/builder/username_error_file_scheme.phpt b/ext/uri/tests/whatwg/builder/username_error_file_scheme.phpt
index aee81ee3b835..fa1a13af04c0 100644
--- a/ext/uri/tests/whatwg/builder/username_error_file_scheme.phpt
+++ b/ext/uri/tests/whatwg/builder/username_error_file_scheme.phpt
@@ -11,7 +11,7 @@ $builder->setUsername("user");
 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/whatwg/builder/username_error_missing_opaque_host.phpt b/ext/uri/tests/whatwg/builder/username_error_missing_opaque_host.phpt
index 257266f97c91..43ebf550832c 100644
--- a/ext/uri/tests/whatwg/builder/username_error_missing_opaque_host.phpt
+++ b/ext/uri/tests/whatwg/builder/username_error_missing_opaque_host.phpt
@@ -10,7 +10,7 @@ $builder->setUsername("user");
 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/whatwg/equivalence/equals_true_identical.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
index 4dffda8138cb..cf943db6cdd3 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/053.phpt b/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
similarity index 95%
rename from ext/uri/tests/053.phpt
rename to ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
index 7f68772e5487..6b6be92b5010 100644
--- a/ext/uri/tests/053.phpt
+++ b/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test InvalidUrlException constructor error handling
+Test Uri\WhatWg\InvalidUrlException::__construct() - error - reentry
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/052.phpt b/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
similarity index 89%
rename from ext/uri/tests/052.phpt
rename to ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
index b0867b02bd5a..923fe88b7531 100644
--- a/ext/uri/tests/052.phpt
+++ b/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test UrlValidationError constructor error handling
+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
new file mode 100644
index 000000000000..7cdbe1ddc33e
--- /dev/null
+++ b/ext/uri/tests/whatwg/general/array_cast_success.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Test Uri\WhatWg\Url array cast - success
+--FILE--
+<?php
+
+var_dump((array) new Uri\WhatWg\Url("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists"));
+
+?>
+--EXPECTF--
+array(%d) {
+}
diff --git a/ext/uri/tests/whatwg/general/clone_success.phpt b/ext/uri/tests/whatwg/general/clone_success.phpt
new file mode 100644
index 000000000000..2a1500da3a95
--- /dev/null
+++ b/ext/uri/tests/whatwg/general/clone_success.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test Uri\WhatWg\Url cloning - success
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://example.com");
+$url2 = clone $url1;
+
+var_dump($url1->toAsciiString());
+
+var_dump($url2);
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECTF--
+string(20) "https://example.com/"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://example.com/"
diff --git a/ext/uri/tests/whatwg/general/constructor_error_reinitialization.phpt b/ext/uri/tests/whatwg/general/constructor_error_reinitialization.phpt
new file mode 100644
index 000000000000..e6e0ecde312d
--- /dev/null
+++ b/ext/uri/tests/whatwg/general/constructor_error_reinitialization.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Test Uri\WhatWg\Url __construct() - error - reinitialization
+--FILE--
+<?php
+
+$url = new Uri\WhatWg\Url('https://example.com');
+
+try {
+    $url->__construct('ftp://example.org');
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+Error: Cannot modify readonly object of class Uri\WhatWg\Url
+object(Uri\WhatWg\Url)#%d (8) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://example.com/"
diff --git a/ext/uri/tests/022.phpt b/ext/uri/tests/whatwg/general/extension_error.phpt
similarity index 82%
rename from ext/uri/tests/022.phpt
rename to ext/uri/tests/whatwg/general/extension_error.phpt
index da079b9781dc..540b6c0cf8bc 100644
--- a/ext/uri/tests/022.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
new file mode 100644
index 000000000000..8b97899bce0c
--- /dev/null
+++ b/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test Uri\WhatWg\Url instantiation - error - without calling the constructor
+--EXTENSIONS--
+reflection
+uri
+--FILE--
+<?php
+
+try {
+    $reflectionClass = new ReflectionClass(Uri\WhatWg\Url::class);
+    $reflectionClass->newInstanceWithoutConstructor();
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+ReflectionException: Class Uri\WhatWg\Url is an internal class marked as final that cannot be instantiated without invoking its constructor
diff --git a/ext/uri/tests/056.phpt b/ext/uri/tests/whatwg/general/memory_management.phpt
similarity index 59%
rename from ext/uri/tests/056.phpt
rename to ext/uri/tests/whatwg/general/memory_management.phpt
index 7f348774459f..915e31350676 100644
--- a/ext/uri/tests/056.phpt
+++ b/ext/uri/tests/whatwg/general/memory_management.phpt
@@ -6,11 +6,11 @@ Test Lexbor memory management
 $urls = [];
 
 for ($i = 0; $i < 1000; $i++) {
-    $urls[] = Uri\WhatWg\Url::parse("https://example.com/{$i}/");
+    $urls[] = Uri\WhatWg\Url::parse("https://example.com/$i/");
 }
 
 for ($i = 0; $i < 1000; $i++) {
-    if ($urls[$i]->toAsciiString() !== "https://example.com/{$i}/") {
+    if ($urls[$i]->toAsciiString() !== "https://example.com/$i/") {
         die("FAIL");
     }
 }
diff --git a/ext/uri/tests/whatwg/getters/basic_success_percent_encoded_components.phpt b/ext/uri/tests/whatwg/getters/basic_success_percent_encoded_components.phpt
new file mode 100644
index 000000000000..e864d5fb63c0
--- /dev/null
+++ b/ext/uri/tests/whatwg/getters/basic_success_percent_encoded_components.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test Uri\WhatWg\Url component retrieval - basic - percent-encoded components
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("http://%61pple:p%61ss@ex%61mple.com/foob%61r?%61bc=%61bc#%61bc");
+
+var_dump($url->getScheme());
+var_dump($url->getUsername());
+var_dump($url->getPassword());
+var_dump($url->getAsciiHost());
+var_dump($url->getUnicodeHost());
+var_dump($url->getPort());
+var_dump($url->getPath());
+var_dump($url->getQuery());
+var_dump($url->getFragment());
+
+?>
+--EXPECT--
+string(4) "http"
+string(7) "%61pple"
+string(6) "p%61ss"
+string(11) "example.com"
+string(11) "example.com"
+NULL
+string(9) "/foob%61r"
+string(11) "%61bc=%61bc"
+string(5) "%61bc"
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 7d178691fc01..1184bc2d8931 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 5131a2574001..06a6866dcfcd 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 ff6e9097772c..9d16bc79f543 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 038fd70ea887..00cd9dce394e 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 6e6424f8ef13..12bf55c49639 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 30353dc2e9f7..9bafc17837d2 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 b43631a3415b..186a7607e6be 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 cee1adc61c5d..20af982238bf 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 aab507be992a..83eeed92a4ae 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 d4af5c748725..110bfe667d46 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 deca314462b8..8aefb1251e4a 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 @@ $url = Uri\WhatWg\Url::parse("foo://example.com");
 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 235960f19b53..52460752c88f 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 @@ $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;
+    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 000000000000..e27a2544cc0f
--- /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 f465bb85f226..5697e1833040 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 @@ $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;
+    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 c280140381d8..f5c80ab7496f 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 f465bb85f226..000000000000
--- 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 b6f501a201aa..66acd721f7b5 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 719a3756a105..ab8c1cf65bdd 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 e5e30570ba9b..69f53823e914 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 45535cb88a8a..1d5fc66f7c3f 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 3e986f0b48bf..1bb99b08e447 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 7b4a2fad9085..8f95fd88e823 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 codepoint
+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 98c794ad7868..0ff8a690e70e 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 143465481f66..a34e0ea2574c 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
new file mode 100644
index 000000000000..14f7f720bb9f
--- /dev/null
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test Uri\WhatWg\Url::withHost() - success - changing IPv4 to IPv6
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://192.168.0.1");
+$url2 = $url1->withHost("[2001:db8:3333:4444:5555:6666:7777:8888]");
+
+var_dump($url1->getAsciiHost());
+
+var_dump($url2->getAsciiHost());
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECT--
+string(11) "192.168.0.1"
+string(40) "[2001:db8:3333:4444:5555:6666:7777:8888]"
+string(49) "https://[2001:db8:3333:4444:5555:6666:7777:8888]/"
diff --git a/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt b/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
index f6665f6594aa..8ad078f5f267 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 b5dd89446601..7c3c72609793 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 @@ $url = new Uri\WhatWg\Url("https://example.com")
 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 242c17430101..88d36bdb36ea 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 72bb5256cdde..6f7c3a8c6866 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 217e8f174d8b..84ca2c4e92d4 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 b7f2f5485241..97c1a269f260 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 f3aedc393b2b..d27f6debc1d3 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 5c074a16a9eb..b93269c1d562 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 3ee703024d73..350a852b403f 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 1f53b4c3b31f..083a8a9bce3b 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 70d405415eb5..e783105a4c86 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 62127d739187..ba6083a335bc 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 ea4bac4b06aa..4bb5f0076725 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 a871b6614a75..4e0f9eb90703 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 e17856f26dbc..54847894ebb7 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 5ee661454f4f..2b432acf3d31 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 ec7918a5a4f4..38b818085d18 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 e753771aa9b8..0520f93b1e13 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 1a54a0882a42..0cf0aa29ad19 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 c0991afb0969..a48b0f8b5b25 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 1c6f447acd1e..4993a7dbdecb 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 204b3caccc96..f641cce37eda 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
 
@@ -8,9 +8,11 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withPort(65536);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
+    var_dump($e->errors[0]->type === Uri\WhatWg\UrlValidationErrorType::PortOutOfRange);
 }
 
 ?>
 --EXPECT--
 Uri\WhatWg\InvalidUrlException: The specified port is malformed (PortOutOfRange)
+bool(true)
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 df392ab4b744..528e2549d3c1 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
 
@@ -7,6 +7,7 @@ $url1 = new Uri\WhatWg\Url("scheme://");
 $url2 = $url1->withPort(433);
 
 var_dump($url1->getPort());
+
 var_dump($url2->getPort());
 var_dump($url2->toAsciiString());
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_existing.phpt b/ext/uri/tests/whatwg/modification/port_success_existing.phpt
index f84e0a9c2de2..0ff800d88c2b 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
new file mode 100644
index 000000000000..c4103d4aa31e
--- /dev/null
+++ b/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test Uri\WhatWg\Url::withPort() - success - file scheme
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("file:///foo/bar");
+$url2 = $url1->withPort(80);
+
+var_dump($url1->getPort());
+
+var_dump($url2->getPort());
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECT--
+NULL
+NULL
+string(15) "file:///foo/bar"
diff --git a/ext/uri/tests/whatwg/modification/port_success_new.phpt b/ext/uri/tests/whatwg/modification/port_success_new.phpt
index de23a1934aca..f71f1278ad3e 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 979a41a3a8ec..b85babc39a0a 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 7570768cd27c..f8640ce8a949 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 2aa7f3c07cfe..788a610e2e87 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 07ea45d9d8e9..55f4dc90295b 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 88c164039a5b..1423ab4c54ad 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 95a857d0f4de..0201105d7c94 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 f8b94f435293..ee7f50be4ed4 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 ef319c04708f..f74399ed813f 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 317c4fa4687d..eda22cc4b0cf 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 873e17d787f3..80a151ae246f 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 a993ca28b94f..165b49244f32 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 f30a49b868c3..582e7148f1a4 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 e898da5a39ab..5224c7f091e7 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 1be347236552..10524914db32 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 d43e5e22dbbf..40f8b64423d3 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 0113d4ff8366..5670d5947913 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 906a99585ad1..1567f047222f 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 90256bbab1c0..278f579aeed9 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 649d318b8973..9b98fa9bfbf9 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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 838769ec30ff..df4413ef6357 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 88432552274f..e7d265e3d8a6 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 103c77e1eb7a..e61e4759caae 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 9763c9c51949..c2369fe1e7a5 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 13357d269b49..91f37ebc9621 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
new file mode 100644
index 000000000000..439d3212e3a0
--- /dev/null
+++ b/ext/uri/tests/whatwg/modification/username_success_encoded.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test Uri\WhatWg\Url::withUsername() - success - percent-encoded octet byte
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://example.com");
+$url2 = $url1->withUsername("%75s%2Fr");
+
+var_dump($url1->getUsername());
+
+var_dump($url2->getUsername());
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECT--
+NULL
+string(8) "%75s%2Fr"
+string(29) "https://%75s%2Fr@example.com/"
diff --git a/ext/uri/tests/whatwg/modification/username_success_existing.phpt b/ext/uri/tests/whatwg/modification/username_success_existing.phpt
index a0a1e5ffad95..bfc3b4a414e0 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
new file mode 100644
index 000000000000..e4ca78e80668
--- /dev/null
+++ b/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test Uri\WhatWg\Url::withUsername() - success - file scheme
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("file:///foo/bar/");
+$url2 = $url1->withUsername("user");
+
+var_dump($url1->getUsername());
+
+var_dump($url2->getUsername());
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECT--
+NULL
+NULL
+string(16) "file:///foo/bar/"
diff --git a/ext/uri/tests/whatwg/modification/username_success_new.phpt b/ext/uri/tests/whatwg/modification/username_success_new.phpt
index f8672916ad5e..45887c194763 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 7428dfe96022..e7520a50b42b 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 59d3a42a1fdc..990d3f67ece4 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 2e6ba48a1dd9..36ab106ee141 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 b462100a7e2e..5a71581b0ca1 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 938202b5c7d6..1394e982b8e2 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_url_returns_null.phpt b/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
new file mode 100644
index 000000000000..aeb4275fbd7b
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - basic - parse() returns null for an emoji relative-URL
+--FILE--
+<?php
+
+$errors = [];
+$url = Uri\WhatWg\Url::parse("🐘", null, $errors);
+
+var_dump($url);
+var_dump($errors);
+
+?>
+--EXPECTF--
+NULL
+array(1) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(4) "🐘"
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::MissingSchemeNonRelativeUrl)
+    ["failure"]=>
+    bool(true)
+  }
+}
diff --git a/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt b/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
index 2b7114baa738..8375e16a9289 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 @@ Test Uri\WhatWg\Url parsing - basic - empty string
 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/basic_success_constructor.phpt b/ext/uri/tests/whatwg/parsing/basic_success_constructor.phpt
new file mode 100644
index 000000000000..65bb588b5673
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/basic_success_constructor.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - basic - parsing all components with the constructor
+--FILE--
+<?php
+
+$url = new Uri\WhatWg\Url("https://username:password@example.com:8080/path?q=r#fragment");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  string(8) "username"
+  ["password"]=>
+  string(8) "password"
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  int(8080)
+  ["path"]=>
+  string(5) "/path"
+  ["query"]=>
+  string(3) "q=r"
+  ["fragment"]=>
+  string(8) "fragment"
+}
+string(60) "https://username:password@example.com:8080/path?q=r#fragment"
diff --git a/ext/uri/tests/whatwg/parsing/basic_success_invalid_url_unit_warnings.phpt b/ext/uri/tests/whatwg/parsing/basic_success_invalid_url_unit_warnings.phpt
new file mode 100644
index 000000000000..4ee2a3d3b921
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/basic_success_invalid_url_unit_warnings.phpt
@@ -0,0 +1,53 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - basic - invalid URL unit warnings
+--FILE--
+<?php
+
+$errors = [];
+$url = new Uri\WhatWg\Url(" https://example.org ", null, $errors);
+
+var_dump($url);
+var_dump($url->toAsciiString());
+var_dump($errors);
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.org"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://example.org/"
+array(2) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(1) " "
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+    ["failure"]=>
+    bool(false)
+  }
+  [1]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(21) " https://example.org "
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+    ["failure"]=>
+    bool(false)
+  }
+}
diff --git a/ext/uri/tests/005.phpt b/ext/uri/tests/whatwg/parsing/basic_success_multibyte.phpt
similarity index 86%
rename from ext/uri/tests/005.phpt
rename to ext/uri/tests/whatwg/parsing/basic_success_multibyte.phpt
index 8d8be9679397..b6856ec22177 100644
--- a/ext/uri/tests/005.phpt
+++ b/ext/uri/tests/whatwg/parsing/basic_success_multibyte.phpt
@@ -1,10 +1,8 @@
 --TEST--
-Parse multibyte URLs
+Test Uri\WhatWg\Url parsing - basic - multibyte URL
 --FILE--
 <?php
 
-var_dump(Uri\Rfc3986\Uri::parse("http://username:password@héééostname:9090/gah/../path?arg=vaéue#anchor"));
-
 $url = Uri\WhatWg\Url::parse("http://username:password@héééostname:9090/gah/../path?arg=vaéue#anchor");
 var_dump($url);
 var_dump($url->getAsciiHost());
@@ -14,7 +12,6 @@ var_dump($url->toUnicodeString());
 
 ?>
 --EXPECTF--
-NULL
 object(Uri\WhatWg\Url)#%d (%d) {
   ["scheme"]=>
   string(4) "http"
diff --git a/ext/uri/tests/057.phpt b/ext/uri/tests/whatwg/parsing/errors_error_typed_property_reference.phpt
similarity index 61%
rename from ext/uri/tests/057.phpt
rename to ext/uri/tests/whatwg/parsing/errors_error_typed_property_reference.phpt
index 5cc4e5974212..dbbf04b24bf9 100644
--- a/ext/uri/tests/057.phpt
+++ b/ext/uri/tests/whatwg/parsing/errors_error_typed_property_reference.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test assigning errors by reference fails
+Test Uri\WhatWg\Url parsing - errors - assignment to a typed property reference
 --FILE--
 <?php
 
 class Foo {
-	public string $x = '';
+    public string $x = '';
 }
 
 $f = new Foo();
 try {
     Uri\WhatWg\Url::parse(" https://example.org ", errors: $f->x);
 } 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 8444ee9e3e96..fc6a4335c0fb 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 @@ Test Uri\WhatWg\Url parsing - host - invalid code point
 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 92b317078ebb..acc4f30696a3 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 @@ Test Uri\WhatWg\Url parsing - host - empty
 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 726241674fae..2a16305f9ebf 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 @@ Test Uri\WhatWg\Url parsing - host - empty
 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 90f2738148f4..f3f8458e8645 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 @@ Test Uri\WhatWg\Url parsing - host - empty
 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 959aa0c4442b..9595a6bce61a 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 @@ Test Uri\WhatWg\Url parsing - host - IPvFuture
 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 f450d26c4164..d65d623ffb0d 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 25a28a9750c4..4129fa5d20b9 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 @@ Test Uri\WhatWg\Url parsing - host - empty
 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_success_ipv4_fullwidth.phpt b/ext/uri/tests/whatwg/parsing/host_success_ipv4_fullwidth.phpt
new file mode 100644
index 000000000000..fa1e5042e7e5
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/host_success_ipv4_fullwidth.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - host - IPv4 address with fullwidth characters
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("https://０Ｘｃ０．０２５０．０１");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "192.168.0.1"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://192.168.0.1/"
diff --git a/ext/uri/tests/whatwg/parsing/host_success_ipv4_octal.phpt b/ext/uri/tests/whatwg/parsing/host_success_ipv4_octal.phpt
new file mode 100644
index 000000000000..ea6e71fed6b2
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/host_success_ipv4_octal.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - host - IPv4 address in octal notation
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("https://0300.0250.0000.0001");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "192.168.0.1"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://192.168.0.1/"
diff --git a/ext/uri/tests/whatwg/parsing/host_success_ipv6_short.phpt b/ext/uri/tests/whatwg/parsing/host_success_ipv6_short.phpt
new file mode 100644
index 000000000000..5027dc093303
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/host_success_ipv6_short.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - host - short IPv6
+--FILE--
+<?php
+
+$url = new Uri\WhatWg\Url("https://[0:0::1]");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(5) "[::1]"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(14) "https://[::1]/"
diff --git a/ext/uri/tests/whatwg/parsing/host_success_multibyte.phpt b/ext/uri/tests/whatwg/parsing/host_success_multibyte.phpt
index 15613a1a0a9d..53cb4174bbcd 100644
--- a/ext/uri/tests/whatwg/parsing/host_success_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_success_multibyte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - host - multibyte codepoint
+Test Uri\WhatWg\Url parsing - host - multibyte code point
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/parsing/host_success_multibyte_emoji.phpt b/ext/uri/tests/whatwg/parsing/host_success_multibyte_emoji.phpt
new file mode 100644
index 000000000000..2b269195fe65
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/host_success_multibyte_emoji.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - host - emoji code point
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("https://🐘.com");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+var_dump($url->toUnicodeString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(12) "xn--go8h.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(21) "https://xn--go8h.com/"
+string(17) "https://🐘.com/"
diff --git a/ext/uri/tests/whatwg/parsing/password_success_multibyte.phpt b/ext/uri/tests/whatwg/parsing/password_success_multibyte.phpt
index 96d636ea2847..7098fc6b681b 100644
--- a/ext/uri/tests/whatwg/parsing/password_success_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/password_success_multibyte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - password - multibyte codepoint
+Test Uri\WhatWg\Url parsing - password - multibyte code point
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/parsing/password_success_percent_encode_set.phpt b/ext/uri/tests/whatwg/parsing/password_success_percent_encode_set.phpt
index 3a104bd63405..9c96da995726 100644
--- a/ext/uri/tests/whatwg/parsing/password_success_percent_encode_set.phpt
+++ b/ext/uri/tests/whatwg/parsing/password_success_percent_encode_set.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - password - codepoint in percent-encode set
+Test Uri\WhatWg\Url parsing - password - code point in percent-encode set
 --FILE--
 <?php
 
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 8e6c6fd3842e..b61cecb9341e 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 01d549210d9f..1f40dfb945f4 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 9c6a7a7906b2..b0994261d257 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/path_success_file_backslash_and_spaces.phpt b/ext/uri/tests/whatwg/parsing/path_success_file_backslash_and_spaces.phpt
new file mode 100644
index 000000000000..1c728db13e5e
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/path_success_file_backslash_and_spaces.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - path - file URL with a backslash and spaces
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("file:///E:\Documents and Settings");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(4) "file"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(0) ""
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(30) "/E:/Documents%20and%20Settings"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(37) "file:///E:/Documents%20and%20Settings"
diff --git a/ext/uri/tests/whatwg/parsing/path_success_multibyte_emoji.phpt b/ext/uri/tests/whatwg/parsing/path_success_multibyte_emoji.phpt
new file mode 100644
index 000000000000..b4e223c4bbd0
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/path_success_multibyte_emoji.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - path - emoji code point
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("https://example.com/🐘");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(13) "/%F0%9F%90%98"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(32) "https://example.com/%F0%9F%90%98"
diff --git a/ext/uri/tests/whatwg/parsing/path_success_percent_encode_set2.phpt b/ext/uri/tests/whatwg/parsing/path_success_percent_encode_set2.phpt
index dd82beeff101..6690fd9e0e8a 100644
--- a/ext/uri/tests/whatwg/parsing/path_success_percent_encode_set2.phpt
+++ b/ext/uri/tests/whatwg/parsing/path_success_percent_encode_set2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - path - codepoint in percent-encode set
+Test Uri\WhatWg\Url parsing - path - code point in percent-encode set
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/parsing/path_success_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/path_success_percent_encoded.phpt
new file mode 100644
index 000000000000..01162c70b362
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/path_success_percent_encoded.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - path - percent-encoded byte
+--FILE--
+<?php
+
+$url = new Uri\WhatWg\Url("https://example.com/foo/bar%2Fbaz");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(14) "/foo/bar%2Fbaz"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(33) "https://example.com/foo/bar%2Fbaz"
diff --git a/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt b/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
index 8175f2ca992a..886ed4f265ee 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 @@ Test Uri\WhatWg\Url parsing - port - multibyte
 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 bb23476db57c..44557c20635e 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 @@ Test Uri\WhatWg\Url parsing - port - negative value
 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 874211ccb1cf..ee22ec0caa4e 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/054.phpt b/ext/uri/tests/whatwg/parsing/port_error_too_large.phpt
similarity index 53%
rename from ext/uri/tests/054.phpt
rename to ext/uri/tests/whatwg/parsing/port_error_too_large.phpt
index 386f88ae93e5..f9e045728307 100644
--- a/ext/uri/tests/054.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_too_large.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test UrlValidationErrorType singleton
+Test Uri\WhatWg\Url parsing - port - too large
 --FILE--
 <?php
 
 try {
-    new \Uri\WhatWg\Url('http://localhost:99999');
+    new Uri\WhatWg\Url('http://localhost:99999');
 } catch (Throwable $e) {
     echo $e::class, ': ', $e->getMessage(), "\n";
-    var_dump($e->errors[0]->type === \Uri\WhatWg\UrlValidationErrorType::PortOutOfRange);
+    var_dump($e->errors[0]->type === Uri\WhatWg\UrlValidationErrorType::PortOutOfRange);
 }
 
 ?>
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 f0f79670230d..f20bef470d52 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 @@ Test Uri\WhatWg\Url parsing - port - user info component is in wrong place
 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/query_success_multibyte.phpt b/ext/uri/tests/whatwg/parsing/query_success_multibyte.phpt
new file mode 100644
index 000000000000..19e5adf2a415
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/query_success_multibyte.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - query - multibyte code points
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("http://example.com?foo=Helló Wörld");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  string(27) "foo=Hell%C3%B3%20W%C3%B6rld"
+  ["fragment"]=>
+  NULL
+}
+string(47) "http://example.com/?foo=Hell%C3%B3%20W%C3%B6rld"
diff --git a/ext/uri/tests/whatwg/parsing/query_success_multibyte_emoji.phpt b/ext/uri/tests/whatwg/parsing/query_success_multibyte_emoji.phpt
new file mode 100644
index 000000000000..8815bf09330a
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/query_success_multibyte_emoji.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - query - emoji code points
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("https://example.com/?🐘=🐘");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  string(25) "%F0%9F%90%98=%F0%9F%90%98"
+  ["fragment"]=>
+  NULL
+}
+string(46) "https://example.com/?%F0%9F%90%98=%F0%9F%90%98"
diff --git a/ext/uri/tests/whatwg/parsing/query_success_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/query_success_percent_encoded.phpt
new file mode 100644
index 000000000000..cf0cd280d984
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/query_success_percent_encoded.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - query - percent-encoded bytes
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("http://example.com?foo=Hell%C3%B3+W%C3%B6rld");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  string(25) "foo=Hell%C3%B3+W%C3%B6rld"
+  ["fragment"]=>
+  NULL
+}
+string(45) "http://example.com/?foo=Hell%C3%B3+W%C3%B6rld"
diff --git a/ext/uri/tests/whatwg/parsing/query_success_percent_encoded_special.phpt b/ext/uri/tests/whatwg/parsing/query_success_percent_encoded_special.phpt
new file mode 100644
index 000000000000..a10f8c644928
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/query_success_percent_encoded_special.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - query - percent-encoded special characters
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("http://example.com?foobar=%27%3Cscript%3E+%2B+%40");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  string(30) "foobar=%27%3Cscript%3E+%2B+%40"
+  ["fragment"]=>
+  NULL
+}
+string(50) "http://example.com/?foobar=%27%3Cscript%3E+%2B+%40"
diff --git a/ext/uri/tests/whatwg/parsing/query_success_plus.phpt b/ext/uri/tests/whatwg/parsing/query_success_plus.phpt
new file mode 100644
index 000000000000..12ea59a6b056
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/query_success_plus.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - query - plus character
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("http://example.com?foo=foo+bar");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  string(11) "foo=foo+bar"
+  ["fragment"]=>
+  NULL
+}
+string(31) "http://example.com/?foo=foo+bar"
diff --git a/ext/uri/tests/whatwg/parsing/query_success_special.phpt b/ext/uri/tests/whatwg/parsing/query_success_special.phpt
new file mode 100644
index 000000000000..a49a9f61cc00
--- /dev/null
+++ b/ext/uri/tests/whatwg/parsing/query_success_special.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url parsing - query - special characters
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("http://example.com?foobar='<script> + @");
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(4) "http"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  string(30) "foobar=%27%3Cscript%3E%20+%20@"
+  ["fragment"]=>
+  NULL
+}
+string(50) "http://example.com/?foobar=%27%3Cscript%3E%20+%20@"
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
index 023c1d3fab9d..f5f39669558b 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 @@ Test Uri\WhatWg\Url parsing - scheme - empty
 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 9c69b08161ef..7b16223f2d25 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 @@ Test Uri\WhatWg\Url parsing - scheme - invalid character
 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 0d6601e718ea..d814c849b9bd 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - scheme - multibyte codepoint
+Test Uri\WhatWg\Url parsing - scheme - multibyte code point
 --FILE--
 <?php
 
 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 5674c1f33093..13428f0e6b68 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 @@ Test Uri\WhatWg\Url parsing - scheme - null byte
 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 92832f65a019..2caf11fab36b 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 @@ Test Uri\WhatWg\Url parsing - scheme - only scheme
 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 22ab6fc53515..fa21e6d2490b 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 @@ Test Uri\WhatWg\Url parsing - scheme - only scheme
 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 a0324edd3701..ff857b3c972b 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 9966ad6248e5..5196c92c262c 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 @@ Test Uri\WhatWg\Url parsing - scheme - invalid character
 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/059.phpt b/ext/uri/tests/whatwg/parsing/scheme_success_extra_slashes.phpt
similarity index 50%
rename from ext/uri/tests/059.phpt
rename to ext/uri/tests/whatwg/parsing/scheme_success_extra_slashes.phpt
index 23971cd4ebe0..3aa686c10d8f 100644
--- a/ext/uri/tests/059.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_success_extra_slashes.phpt
@@ -1,14 +1,16 @@
 --TEST--
-Test empty ports become null
+Test Uri\WhatWg\Url parsing - scheme - extra slashes
 --FILE--
 <?php
 
-$uri = new \Uri\Rfc3986\Uri('https://example.com:');
-var_dump($uri, $uri->getPort());
+$url = Uri\WhatWg\Url::parse("HTTPS://////EXAMPLE.com");
+
+var_dump($url);
+var_dump($url->toAsciiString());
 
 ?>
 --EXPECTF--
-object(Uri\Rfc3986\Uri)#%d (8) {
+object(Uri\WhatWg\Url)#%d (%d) {
   ["scheme"]=>
   string(5) "https"
   ["username"]=>
@@ -20,10 +22,10 @@ object(Uri\Rfc3986\Uri)#%d (8) {
   ["port"]=>
   NULL
   ["path"]=>
-  string(0) ""
+  string(1) "/"
   ["query"]=>
   NULL
   ["fragment"]=>
   NULL
 }
-NULL
+string(20) "https://example.com/"
diff --git a/ext/uri/tests/whatwg/parsing/username_success_multibyte.phpt b/ext/uri/tests/whatwg/parsing/username_success_multibyte.phpt
index bf08c404d043..788dbd944bca 100644
--- a/ext/uri/tests/whatwg/parsing/username_success_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/username_success_multibyte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - username - multibyte codepoint
+Test Uri\WhatWg\Url parsing - username - multibyte code point
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/parsing/username_success_percent_encode_set.phpt b/ext/uri/tests/whatwg/parsing/username_success_percent_encode_set.phpt
index d4aeaf61d72e..31bffc09f2f8 100644
--- a/ext/uri/tests/whatwg/parsing/username_success_percent_encode_set.phpt
+++ b/ext/uri/tests/whatwg/parsing/username_success_percent_encode_set.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - username - codepoint in percent-encode set
+Test Uri\WhatWg\Url parsing - username - code point in percent-encode set
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt b/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
new file mode 100644
index 000000000000..994a05cdc2be
--- /dev/null
+++ b/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url::parse() - success - absolute URL with base URL
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("https://test.com/with-base-in-vain", Uri\WhatWg\Url::parse("https://example.com/"));
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(8) "test.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(18) "/with-base-in-vain"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(34) "https://test.com/with-base-in-vain"
diff --git a/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt b/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
new file mode 100644
index 000000000000..b24a335f0369
--- /dev/null
+++ b/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test Uri\WhatWg\Url::parse() - success - relative-URL with base URL
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("/with-base", new Uri\WhatWg\Url("https://example.com"));
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(10) "/with-base"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(29) "https://example.com/with-base"
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 15b2a141f2fd..ede2c6705112 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 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 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
new file mode 100644
index 000000000000..6213f32417df
--- /dev/null
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test Uri\WhatWg\Url::resolve() - error - IPv4 with too many parts
+--FILE--
+<?php
+
+$url = new Uri\WhatWg\Url("https://example.com");
+
+try {
+    $url->resolve("https://1.2.3.4.5");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified URI is malformed (Ipv4TooManyParts)
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
new file mode 100644
index 000000000000..e1ed1cc5f275
--- /dev/null
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test Uri\WhatWg\Url::resolve() - success - absolute URL
+--FILE--
+<?php
+
+$url1 = new Uri\WhatWg\Url("https://example.com");
+$url2 = $url1->resolve("https://test.com/foo");
+
+var_dump($url1->toAsciiString());
+
+var_dump($url2);
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECTF--
+string(20) "https://example.com/"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(8) "test.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(4) "/foo"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://test.com/foo"
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
new file mode 100644
index 000000000000..e2660e1db0a5
--- /dev/null
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Test Uri\WhatWg\Url::resolve() - success - invalid URL unit warning
+--FILE--
+<?php
+
+$errors = [];
+$url1 = new Uri\WhatWg\Url("https://example.com");
+$url2 = $url1->resolve(" /foo", $errors);
+
+var_dump($url1->toAsciiString());
+
+var_dump($url2);
+var_dump($url2->toAsciiString());
+var_dump($errors);
+
+?>
+--EXPECTF--
+string(20) "https://example.com/"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(4) "/foo"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(23) "https://example.com/foo"
+array(%d) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(5) " /foo"
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+    ["failure"]=>
+    bool(false)
+  }
+}
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 f26b2eb5fa5c..0d7e41a699c6 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_url.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
new file mode 100644
index 000000000000..306f54ad3d90
--- /dev/null
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test Uri\WhatWg\Url::resolve() - success - relative-URL
+--FILE--
+<?php
+
+$url1 = new Uri\WhatWg\Url("https://example.com");
+$url2 = $url1->resolve("/foo/");
+
+var_dump($url1->toAsciiString());
+
+var_dump($url2);
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECTF--
+string(20) "https://example.com/"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(5) "/foo/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(24) "https://example.com/foo/"
diff --git a/ext/uri/tests/whatwg/serialization/basic_success.phpt b/ext/uri/tests/whatwg/serialization/basic_success.phpt
new file mode 100644
index 000000000000..2c31521bc327
--- /dev/null
+++ b/ext/uri/tests/whatwg/serialization/basic_success.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Test Uri\WhatWg\Url serialization and unserialization - success
+--FILE--
+<?php
+
+$url1 = new Uri\WhatWg\Url("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists");
+
+$serializedUrl1 = serialize($url1);
+var_dump($serializedUrl1);
+
+$url2 = unserialize($serializedUrl1);
+var_dump($url2);
+var_dump($url2->toAsciiString());
+
+?>
+--EXPECTF--
+string(163) "O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:99:"https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists";}i:1;a:0:{}}"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  string(8) "username"
+  ["password"]=>
+  string(8) "password"
+  ["host"]=>
+  string(15) "www.example.com"
+  ["port"]=>
+  int(8080)
+  ["path"]=>
+  string(30) "/pathname1/pathname2/pathname3"
+  ["query"]=>
+  string(10) "query=true"
+  ["fragment"]=>
+  string(11) "hash-exists"
+}
+string(99) "https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists"
diff --git a/ext/uri/tests/whatwg/serialization/json_encode_success.phpt b/ext/uri/tests/whatwg/serialization/json_encode_success.phpt
new file mode 100644
index 000000000000..71cd64fe48ae
--- /dev/null
+++ b/ext/uri/tests/whatwg/serialization/json_encode_success.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test Uri\WhatWg\Url json_encode() - success
+--FILE--
+<?php
+
+var_dump(json_encode(new Uri\WhatWg\Url("https://username:password@www.example.com:8080/pathname1/pathname2/pathname3?query=true#hash-exists")));
+
+?>
+--EXPECT--
+string(2) "{}"
diff --git a/ext/uri/tests/whatwg/serialization/unserialize_error_invalid_data.phpt b/ext/uri/tests/whatwg/serialization/unserialize_error_invalid_data.phpt
new file mode 100644
index 000000000000..f46e8799c111
--- /dev/null
+++ b/ext/uri/tests/whatwg/serialization/unserialize_error_invalid_data.phpt
@@ -0,0 +1,70 @@
+--TEST--
+Test Uri\WhatWg\Url unserialize() - error - invalid data
+--FILE--
+<?php
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":1:{i:0;a:0:{}}'); // less than 2 items
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":3:{i:0;a:0:{}i:1;a:0:{}i:2;a:0:{}}'); // more than 2 items
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;N;i:1;a:0:{}}'); // first item is not an array
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:0:{}i:1;a:0:{}}'); // first array is empty
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:2:{s:3:"uri";s:19:"https://example.com";s:1:"a";i:1;}i:1;a:0:{}}'); // "uri" key in first array contains more than 1 item
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";i:1;}i:1;a:0:{}}'); // "uri" key in first array is not a string
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:11:"invalid-url";}i:1;a:0:{}}'); // "uri" key in first array contains invalid URL
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:19:"https://example.com";}i:1;s:0:"";}'); // second item in not an array
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+try {
+    unserialize('O:14:"Uri\WhatWg\Url":2:{i:0;a:1:{s:3:"uri";s:19:"https://example.com";}i:1;a:1:{s:5:"prop1";i:123;}}'); // second array contains property
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+Exception: Invalid serialization data for Uri\WhatWg\Url object
diff --git a/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt b/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
new file mode 100644
index 000000000000..5cb3b14a7663
--- /dev/null
+++ b/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Test Uri\WhatWg\Url unserialize() - error - unsupported C format
+--FILE--
+<?php
+
+unserialize('C:14:"Uri\WhatWg\Url":0:{}');
+
+?>
+--EXPECTF--
+Warning: Class Uri\WhatWg\Url has no unserializer in %s on line %d
+
+Warning: unserialize(): Error at offset 25 of 26 bytes in %s on line %d
diff --git a/ext/uri/tests/whatwg/serialization/unserialize_error_reinitialization.phpt b/ext/uri/tests/whatwg/serialization/unserialize_error_reinitialization.phpt
new file mode 100644
index 000000000000..4c3826e9a1ba
--- /dev/null
+++ b/ext/uri/tests/whatwg/serialization/unserialize_error_reinitialization.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Test Uri\WhatWg\Url __unserialize() - error - reinitialization
+--FILE--
+<?php
+
+$url = new Uri\WhatWg\Url('https://example.com');
+
+try {
+    $url->__unserialize([['uri' => 'ftp://example.org'], []]);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+var_dump($url);
+var_dump($url->toAsciiString());
+
+?>
+--EXPECTF--
+Exception: Invalid serialization data for Uri\WhatWg\Url object
+object(Uri\WhatWg\Url)#%d (8) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(1) "/"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+string(20) "https://example.com/"
diff --git a/ext/uri/tests/101.phpt b/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
similarity index 67%
rename from ext/uri/tests/101.phpt
rename to ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
index b00eeac8f804..7ca93e2d5795 100644
--- a/ext/uri/tests/101.phpt
+++ b/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test the Lexbor-based URI parser
+Test zend_test_uri_parser() - error - invalid Uri\WhatWg\Url
 --EXTENSIONS--
 zend_test
 --FILE--
 <?php
 
 try {
-  var_dump(zend_test_uri_parser('invalid uri', "Uri\\WhatWg\\Url"));
+    var_dump(zend_test_uri_parser('invalid uri', "Uri\\WhatWg\\Url"));
 } catch (Throwable $e) {
-  echo $e::class, ': ', $e->getMessage(), PHP_EOL;
-  var_dump($e->errors);
+    echo $e::class, ': ', $e->getMessage(), "\n";
+    var_dump($e->errors);
 }
 
 ?>
diff --git a/ext/uri/tests/100.phpt b/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
similarity index 95%
rename from ext/uri/tests/100.phpt
rename to ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
index 1ad726123b74..52c5eca1eb22 100644
--- a/ext/uri/tests/100.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/102.phpt b/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
similarity index 94%
rename from ext/uri/tests/102.phpt
rename to ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
index 69d6b21babb3..1edbaa32fc30 100644
--- a/ext/uri/tests/102.phpt
+++ b/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test the handling large ports for the uri struct
+Test zend_test_uri_parser() - success - large RFC 3986 port
 --EXTENSIONS--
 zend_test
 --FILE--