From e36d76b676b5d131bfa2b2bb5649f245cff4dd71 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sat, 9 May 2026 02:45:37 +0300
Subject: [PATCH 01/41] construct.xml Fix classname and extra `e.g.`

---
 reference/uri/uri/whatwg/url/construct.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/whatwg/url/construct.xml b/reference/uri/uri/whatwg/url/construct.xml
index 3eb638ca6930..ed65edc96713 100644
--- a/reference/uri/uri/whatwg/url/construct.xml
+++ b/reference/uri/uri/whatwg/url/construct.xml
@@ -14,7 +14,7 @@
    <methodparam choice="opt"><type>array</type><parameter role="reference">softErrors</parameter><initializer>&null;</initializer></methodparam>
   </constructorsynopsis>
   <simpara>
-   Constructs the <classname>Uri\Rfc3986\Uri</classname> object.
+   Constructs the <classname>Uri\WhatWg\Url</classname> object.
   </simpara>
  </refsect1>
 
@@ -25,7 +25,7 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      A valid URL string to parse (e.g. <literal>/foo</literal> or (e.g. <literal>https://example.com/foo</literal>).
+      A valid URL string to parse (e.g. <literal>/foo</literal> or <literal>https://example.com/foo</literal>).
      </simpara>
     </listitem>
    </varlistentry>

From 9afc9465843d888958eb8f07c2fe416426655271 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sat, 9 May 2026 03:38:20 +0300
Subject: [PATCH 02/41] getasciihost.xml Add more relevant non-ASCII URL for
 example

---
 reference/uri/uri/whatwg/url/getasciihost.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/whatwg/url/getasciihost.xml b/reference/uri/uri/whatwg/url/getasciihost.xml
index 0f239f583868..0b4cbf6275bd 100644
--- a/reference/uri/uri/whatwg/url/getasciihost.xml
+++ b/reference/uri/uri/whatwg/url/getasciihost.xml
@@ -35,16 +35,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com");
+
+$url = new \Uri\WhatWg\Url("https://schönbergstylecode.example.com");
 
 echo $url->getAsciiHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-example.com
+xn--schnbergstylecode-1zb.example.com
 ]]>
    </screen>
   </example>

From 221cc38a179f323a81c3d05e62dcd588bfe7ddd3 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sat, 9 May 2026 13:03:34 +0300
Subject: [PATCH 03/41] parse.xml Remove extra `e.g` and add missing `;` in the
 example

And is the return type `?static` accurate and not `?self` or literally `?Uri\WhatWg\Url`, and doesn't it confuse the reader, since the class is final?
---
 reference/uri/uri/whatwg/url/parse.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/whatwg/url/parse.xml b/reference/uri/uri/whatwg/url/parse.xml
index 4c3dd96ba909..58977965c42b 100644
--- a/reference/uri/uri/whatwg/url/parse.xml
+++ b/reference/uri/uri/whatwg/url/parse.xml
@@ -25,7 +25,7 @@
     <term><parameter>uri</parameter></term>
     <listitem>
      <simpara>
-      A valid URL string to parse (e.g. <literal>/foo</literal> or (e.g. <literal>https://example.com/foo</literal>).
+      A valid URL string to parse (e.g. <literal>/foo</literal> or <literal>https://example.com/foo</literal>).
      </simpara>
     </listitem>
    </varlistentry>
@@ -66,14 +66,14 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $url = \Uri\WhatWg\Url::parse("https://example.com");
 
 if ($url !== null) {
     echo "Valid URL: " . $url->toAsciiString();
 } else {
-    echo "Invalid URL"
+    echo "Invalid URL";
 }
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 9e6640526c3125d80406b4bb3682f517c6d19ea4 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Tue, 12 May 2026 13:42:36 +0300
Subject: [PATCH 04/41] toasciistring.xml Give an URL relevant for the example

---
 reference/uri/uri/whatwg/url/toasciistring.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/whatwg/url/toasciistring.xml b/reference/uri/uri/whatwg/url/toasciistring.xml
index f53c6f5b2016..1556c46156d6 100644
--- a/reference/uri/uri/whatwg/url/toasciistring.xml
+++ b/reference/uri/uri/whatwg/url/toasciistring.xml
@@ -36,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com/foo/bar?baz");
+
+$url = new \Uri\WhatWg\Url("https://schönbergstylecode.example.com/foo/bar?baz");
 
 echo $url->toAsciiString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://xn--schnbergstylecode-1zb.example.com/foo/bar?baz
 ]]>
    </screen>
   </example>

From 7bb800493b99bf2f65439761199221f1a1faa857 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Thu, 14 May 2026 03:42:58 +0300
Subject: [PATCH 05/41] tounicodestring.xml Show how method works

---
 reference/uri/uri/whatwg/url/tounicodestring.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/whatwg/url/tounicodestring.xml b/reference/uri/uri/whatwg/url/tounicodestring.xml
index c45b34fd134a..8e6c0d86cbe6 100644
--- a/reference/uri/uri/whatwg/url/tounicodestring.xml
+++ b/reference/uri/uri/whatwg/url/tounicodestring.xml
@@ -35,16 +35,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$url = new \Uri\WhatWg\Url("https://example.com/foo/bar?baz");
+
+$url = new \Uri\WhatWg\Url("https://xn--schnbergstylecode-1zb.example.com/foo/bar?baz");
 
 echo $url->toUnicodeString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://schönbergstylecode.example.com/foo/bar?baz
 ]]>
    </screen>
   </example>

From d4d68b737c14fb146d473d688ebae9aa5e5272b5 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Thu, 14 May 2026 04:53:28 +0300
Subject: [PATCH 06/41] unserialize.xml Let's deserialize the array, not the
 parameter

---
 reference/uri/uri/whatwg/url/unserialize.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/whatwg/url/unserialize.xml b/reference/uri/uri/whatwg/url/unserialize.xml
index 0a18cacb8718..2f6b3286eba1 100644
--- a/reference/uri/uri/whatwg/url/unserialize.xml
+++ b/reference/uri/uri/whatwg/url/unserialize.xml
@@ -2,7 +2,7 @@
 <refentry xml:id="uri-whatwg-url.unserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\WhatWg\Url::__unserialize</refname>
-  <refpurpose>Deserialize the data parameter into a Url object</refpurpose>
+  <refpurpose>Deserialize the array from the data parameter into a Url object</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -12,7 +12,7 @@
    <methodparam><type>array</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   Deserializes a data parameter into a <classname>Uri\WhatWg\Url</classname> object.
+   Deserializes the &array; from the <parameter>data</parameter> parameter into a <classname>Uri\WhatWg\Url</classname> object.
   </simpara>
  </refsect1>
 

From ae68858ee1b95ca408134fd4714a274991afaf52 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 18:50:23 +0300
Subject: [PATCH 07/41] getfragment.xml Show how the method works

---
 reference/uri/uri/rfc3986/uri/getfragment.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getfragment.xml b/reference/uri/uri/rfc3986/uri/getfragment.xml
index 0fecabee30e8..1dc44a5262c5 100644
--- a/reference/uri/uri/rfc3986/uri/getfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getfragment.xml
@@ -35,16 +35,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com#foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com#%5bfoo%2db%61r%5d");
 
 echo $uri->getFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+%5Bfoo-bar%5D
 ]]>
    </screen>
   </example>

From ab50e34cba03c3f0289adb503ede66af32aa579d Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 18:57:25 +0300
Subject: [PATCH 08/41] getfragment.xml Clarify fragment normalization

---
 reference/uri/uri/rfc3986/uri/getfragment.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/uri/uri/rfc3986/uri/getfragment.xml b/reference/uri/uri/rfc3986/uri/getfragment.xml
index 1dc44a5262c5..eb167f56eaa2 100644
--- a/reference/uri/uri/rfc3986/uri/getfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getfragment.xml
@@ -13,6 +13,7 @@
   </methodsynopsis>
   <simpara>
    Retrieves the normalized fragment component.
+   Normalization converts hex-triplets to uppercase and decodes percent-encoded unreserved characters.
   </simpara>
  </refsect1>
 

From 32db5c367ca8bdfa3260ccc15afd444cc16f6be8 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:25:00 +0300
Subject: [PATCH 09/41] language-snippets.ent Add the URI normalization snippet

---
 language-snippets.ent | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/language-snippets.ent b/language-snippets.ent
index 4ba0f81d1826..66ebd788077f 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -4753,6 +4753,12 @@ local: {
   </simpara>
 '>
 
+<!ENTITY uri.normalization '
+  <simpara>
+   Normalization converts hex-triplets to uppercase and decodes percent-encoded unreserved characters.
+  </simpara>
+'>
+
 <!-- UOPZ snippets -->
 
 <!ENTITY uopz.warn.removed.function-5-0-0 '<warning

From 5cd2822dc5370c933045952d5b2bca61a627b4e8 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:26:25 +0300
Subject: [PATCH 10/41] getfragment.xml Replace a literal sentence with a
 variable

---
 reference/uri/uri/rfc3986/uri/getfragment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/uri/uri/rfc3986/uri/getfragment.xml b/reference/uri/uri/rfc3986/uri/getfragment.xml
index eb167f56eaa2..23b477d02c22 100644
--- a/reference/uri/uri/rfc3986/uri/getfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getfragment.xml
@@ -13,7 +13,7 @@
   </methodsynopsis>
   <simpara>
    Retrieves the normalized fragment component.
-   Normalization converts hex-triplets to uppercase and decodes percent-encoded unreserved characters.
+   &uri.normalization;
   </simpara>
  </refsect1>
 

From b20c7d8e5200cf8412e56ec7e3e0689808a75e33 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:27:20 +0300
Subject: [PATCH 11/41] gethost.xml Clarify normalization

---
 reference/uri/uri/rfc3986/uri/gethost.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/uri/uri/rfc3986/uri/gethost.xml b/reference/uri/uri/rfc3986/uri/gethost.xml
index 4a033e4bfea9..7b38d8bf3398 100644
--- a/reference/uri/uri/rfc3986/uri/gethost.xml
+++ b/reference/uri/uri/rfc3986/uri/gethost.xml
@@ -13,6 +13,7 @@
   </methodsynopsis>
   <simpara>
    Retrieves the normalized host component.
+   &uri.normalization;
   </simpara>
  </refsect1>
 

From 6c3b99a42962040fd5170353d54b64dcf3827bd4 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:28:44 +0300
Subject: [PATCH 12/41] getfragment.xml Move the normalization description to a
 `simpara`

---
 reference/uri/uri/rfc3986/uri/getfragment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/uri/uri/rfc3986/uri/getfragment.xml b/reference/uri/uri/rfc3986/uri/getfragment.xml
index 23b477d02c22..58b2aad53c9e 100644
--- a/reference/uri/uri/rfc3986/uri/getfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getfragment.xml
@@ -13,8 +13,8 @@
   </methodsynopsis>
   <simpara>
    Retrieves the normalized fragment component.
-   &uri.normalization;
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">

From d83270b0aba188193718716f3bd7ed424fc73f99 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:29:12 +0300
Subject: [PATCH 13/41] gethost.xml Move the normalization description to a
 `simpara`

---
 reference/uri/uri/rfc3986/uri/gethost.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/uri/uri/rfc3986/uri/gethost.xml b/reference/uri/uri/rfc3986/uri/gethost.xml
index 7b38d8bf3398..c26fa1e8d622 100644
--- a/reference/uri/uri/rfc3986/uri/gethost.xml
+++ b/reference/uri/uri/rfc3986/uri/gethost.xml
@@ -13,8 +13,8 @@
   </methodsynopsis>
   <simpara>
    Retrieves the normalized host component.
-   &uri.normalization;
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">

From 5784dc8a921000626bfcfa379e4bc48b1bc0127d Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:31:48 +0300
Subject: [PATCH 14/41] gethost.xml Show an example of normalization

---
 reference/uri/uri/rfc3986/uri/gethost.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/gethost.xml b/reference/uri/uri/rfc3986/uri/gethost.xml
index c26fa1e8d622..b1e5df80d806 100644
--- a/reference/uri/uri/rfc3986/uri/gethost.xml
+++ b/reference/uri/uri/rfc3986/uri/gethost.xml
@@ -36,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://ex%61mple.com");
 
 echo $uri->getHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 6e412592efe05058ea5e916cb7ce996c2274fbd1 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:34:57 +0300
Subject: [PATCH 15/41] getpassword.xml Add normalization description

---
 reference/uri/uri/rfc3986/uri/getpassword.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/uri/uri/rfc3986/uri/getpassword.xml b/reference/uri/uri/rfc3986/uri/getpassword.xml
index a5a6d271745f..1a0ff8b8fff7 100644
--- a/reference/uri/uri/rfc3986/uri/getpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getpassword.xml
@@ -15,6 +15,7 @@
    Retrieves the normalized password part (the text after the first <literal>:</literal> character)
    from the userinfo component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">

From eafbfe7a2a62225cc55bed865da9999a6b39ae58 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:45:44 +0300
Subject: [PATCH 16/41] getpath.xml Mention normalization mechanism

---
 reference/uri/uri/rfc3986/uri/getpath.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/uri/uri/rfc3986/uri/getpath.xml b/reference/uri/uri/rfc3986/uri/getpath.xml
index e302667ff34f..45e2a648afaa 100644
--- a/reference/uri/uri/rfc3986/uri/getpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getpath.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized path component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">

From 676c1223677b5b77d1622d31bbc309c7c02fbf5d Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 19:49:38 +0300
Subject: [PATCH 17/41] getpath.xml Show how the method works

---
 reference/uri/uri/rfc3986/uri/getpath.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getpath.xml b/reference/uri/uri/rfc3986/uri/getpath.xml
index 45e2a648afaa..0e2a641a06d2 100644
--- a/reference/uri/uri/rfc3986/uri/getpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getpath.xml
@@ -36,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r");
 
 echo $uri->getPath();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 9cccaee67821e38b91b87ae171ef6bbc3af46e3c Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:07:36 +0300
Subject: [PATCH 18/41] getport.xml Remove the mention of normalization

```PHP_METHOD(Uri_Rfc3986_Uri, getPort)
{
	php_uri_property_read_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_URI_PROPERTY_NAME_PORT, PHP_URI_COMPONENT_READ_MODE_RAW);
}```

Judging by the source code, the `port` component, unlike the `password` or the `host` components, is not normalized. It seems that the mention of normalization was included in the description by mistake :)

```PHP_METHOD(Uri_Rfc3986_Uri, getPassword)
{
	php_uri_property_read_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_URI_PROPERTY_NAME_PASSWORD, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_ASCII);
}```
---
 reference/uri/uri/rfc3986/uri/getport.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getport.xml b/reference/uri/uri/rfc3986/uri/getport.xml
index f62387858b9c..1e4f93e5bdb1 100644
--- a/reference/uri/uri/rfc3986/uri/getport.xml
+++ b/reference/uri/uri/rfc3986/uri/getport.xml
@@ -2,7 +2,7 @@
 <refentry xml:id="uri-rfc3986-uri.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::getPort</refname>
-  <refpurpose>Retrieve the normalized port component</refpurpose>
+  <refpurpose>Retrieve the port component</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -12,7 +12,7 @@
    <void/>
   </methodsynopsis>
   <simpara>
-   Retrieves the normalized port component.
+   Retrieves the port component.
   </simpara>
  </refsect1>
 
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the normalized port component as an &integer; if the port component exists, &null; is returned otherwise.
+   Returns the port component as an &integer; if the port component exists, &null; is returned otherwise.
   </simpara>
  </refsect1>
 
@@ -35,10 +35,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = new \Uri\Rfc3986\Uri("https://example.com:443");
 
 echo $uri->getPort();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 9ea31833c7d41dab227cbbf37ae5f0fa54b44ff1 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:12:07 +0300
Subject: [PATCH 19/41] getquery.xml Add the normalization description + show
 how the method works

---
 reference/uri/uri/rfc3986/uri/getquery.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getquery.xml b/reference/uri/uri/rfc3986/uri/getquery.xml
index 2ae16d783772..3887289fb54e 100644
--- a/reference/uri/uri/rfc3986/uri/getquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getquery.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized query component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=b%61r");
 
 echo $uri->getQuery();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 71ba3b62a2a5f5277d4ed0bbed64a411fd9b80b2 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:29:20 +0300
Subject: [PATCH 20/41] language-snippets.ent Add the non-normalization snippet

---
 language-snippets.ent | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 66ebd788077f..1cb275187db3 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -4755,7 +4755,13 @@ local: {
 
 <!ENTITY uri.normalization '
   <simpara>
-   Normalization converts hex-triplets to uppercase and decodes percent-encoded unreserved characters.
+   Hexadecimal triplets are converted to uppercase, and percent-encoded unreserved characters are decoded.
+  </simpara>
+'>
+
+<!ENTITY uri.non-normalization '
+  <simpara>
+   Hexadecimal triplets are not converted to uppercase, and percent-encoded unreserved characters are not decoded.
   </simpara>
 '>
 

From 28ccf1884af313832d219c3ae48ccac97316b2ac Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:30:33 +0300
Subject: [PATCH 21/41] getrawfragment.xml Add the non-normalization desc

---
 reference/uri/uri/rfc3986/uri/getrawfragment.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reference/uri/uri/rfc3986/uri/getrawfragment.xml b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
index f2e6256bfc3d..0b9bcc227691 100644
--- a/reference/uri/uri/rfc3986/uri/getrawfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) fragment component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">

From ff3f2f2ef4e02bbb01c7d2e4eaa7ee80b6c99aed Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:35:59 +0300
Subject: [PATCH 22/41] getrawfragment.xml Show how the method works

---
 reference/uri/uri/rfc3986/uri/getrawfragment.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawfragment.xml b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
index 0b9bcc227691..2d467387d9ac 100644
--- a/reference/uri/uri/rfc3986/uri/getrawfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawfragment.xml
@@ -36,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com#foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com#foo=b%61r");
 
 echo $uri->getRawFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+foo=b%61r
 ]]>
    </screen>
   </example>

From 43860002f7ac9761f2b5b08e8da09de6d410e5c1 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:42:52 +0300
Subject: [PATCH 23/41] getrawhost.xml Describe non-normalization + show how
 the method works

---
 reference/uri/uri/rfc3986/uri/getrawhost.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawhost.xml b/reference/uri/uri/rfc3986/uri/getrawhost.xml
index 66798f2af8e8..273fe7483e57 100644
--- a/reference/uri/uri/rfc3986/uri/getrawhost.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawhost.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) host component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,7 +36,8 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://ex%61mple.com");
 
 echo $uri->getRawHost();
 ?>
@@ -44,7 +46,7 @@ echo $uri->getRawHost();
    &example.outputs;
    <screen>
 <![CDATA[
-example.com
+ex%61mple.com
 ]]>
    </screen>
   </example>

From e8c7244ae581ecfc146d17ffc6cfee713083005e Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:44:36 +0300
Subject: [PATCH 24/41] Update getrawhost.xml

---
 reference/uri/uri/rfc3986/uri/getrawhost.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawhost.xml b/reference/uri/uri/rfc3986/uri/getrawhost.xml
index 273fe7483e57..dc2e431a31f4 100644
--- a/reference/uri/uri/rfc3986/uri/getrawhost.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawhost.xml
@@ -40,7 +40,6 @@
 $uri = new \Uri\Rfc3986\Uri("https://ex%61mple.com");
 
 echo $uri->getRawHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 2b3d3d3d290c5556eba197a657abbace7e69b829 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:52:02 +0300
Subject: [PATCH 25/41] getrawpassword.xml Describe non-normalization + show
 how the method works

---
 reference/uri/uri/rfc3986/uri/getrawpassword.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawpassword.xml b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
index cbf4a8367347..468a441f2ee0 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
@@ -15,6 +15,7 @@
    Retrieves the raw (non-normalized) password part (the text after the first <literal>:</literal> character)
    from the userinfo component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -38,16 +39,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://user:p%61ssword@example.com");
 
 echo $uri->getRawPassword();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-password
+p%61ssword
 ]]>
    </screen>
   </example>

From 1115ff82319419155f03e1490d5874fc63867425 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 20:56:20 +0300
Subject: [PATCH 26/41] getrawpath.xml Describe non-normalization + show how
 the method works

---
 reference/uri/uri/rfc3986/uri/getrawpath.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawpath.xml b/reference/uri/uri/rfc3986/uri/getrawpath.xml
index 82779af66927..2a07926478d1 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpath.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpath.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) path component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r");
 
 echo $uri->getRawPath();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-/foo/bar
+/foo/b%61r
 ]]>
    </screen>
   </example>

From 2499fbd99e4ed503c28ec3ae73bf00110c0dc607 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:09:40 +0300
Subject: [PATCH 27/41] getrawquery.xml Describe non-serialization + show how
 the method works

---
 reference/uri/uri/rfc3986/uri/getrawquery.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawquery.xml b/reference/uri/uri/rfc3986/uri/getrawquery.xml
index 7b0323f79f27..342666617b81 100644
--- a/reference/uri/uri/rfc3986/uri/getrawquery.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawquery.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) query component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=bar");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com?foo=b%61r");
 
 echo $uri->getRawQuery();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+foo=b%61r
 ]]>
    </screen>
   </example>

From c5e4835d409ab836c6f78becddaba37b913a4090 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:15:51 +0300
Subject: [PATCH 28/41] getrawscheme.xml Describe non-normalization + show how
 the method works

---
 reference/uri/uri/rfc3986/uri/getrawscheme.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawscheme.xml b/reference/uri/uri/rfc3986/uri/getrawscheme.xml
index ff6130f94537..26b822fc5481 100644
--- a/reference/uri/uri/rfc3986/uri/getrawscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawscheme.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) scheme component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("httpS://example.com");
 
 echo $uri->getRawScheme();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https
+httpS
 ]]>
    </screen>
   </example>

From 94cfff98d4c9dc4480796084bc49d61c675af169 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:20:38 +0300
Subject: [PATCH 29/41] getrawuserinfo.xml Describe non-normalization + amend
 the example

---
 reference/uri/uri/rfc3986/uri/getrawuserinfo.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml b/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
index 57a32f30a165..7b0080c88848 100644
--- a/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawuserinfo.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the raw (non-normalized) userinfo component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://user:p%61ssword@example.com");
 
 echo $uri->getRawUserInfo();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-user:password
+user:p%61ssword
 ]]>
    </screen>
   </example>

From efaaaf3bbc5bf6cd286a19ecf12931526a0bdd0d Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:29:20 +0300
Subject: [PATCH 30/41] getrawpassword.xml Remove the mention of...

...an non-normalized in the return section for consistency with other methods
---
 reference/uri/uri/rfc3986/uri/getrawpassword.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawpassword.xml b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
index 468a441f2ee0..1d5f5625d531 100644
--- a/reference/uri/uri/rfc3986/uri/getrawpassword.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawpassword.xml
@@ -26,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the raw (non-normalized) password as a &string; if the userinfo component contains a <literal>:</literal> character.
+   Returns the raw password as a &string; if the userinfo component contains a <literal>:</literal> character.
    An empty string is returned when the userinfo component doesn't contain a <literal>:</literal> character.
    &null; is returned when the userinfo component doesn't exist.
   </simpara>

From 945dfaa2d4b591e37ec92e3c88658d08a7621d58 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:30:23 +0300
Subject: [PATCH 31/41] getrawusername.xml Describe non-normalization

---
 reference/uri/uri/rfc3986/uri/getrawusername.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getrawusername.xml b/reference/uri/uri/rfc3986/uri/getrawusername.xml
index 5dff1a6903af..bf2e8fe17764 100644
--- a/reference/uri/uri/rfc3986/uri/getrawusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getrawusername.xml
@@ -15,6 +15,7 @@
    Retrieves the raw (non-normalized) username part (the text before the first <literal>:</literal> character)
    from userinfo component.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -25,7 +26,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the raw (non-normalized) username as a &string; if the userinfo component exists, &null; is returned otherwise.
+   Returns the raw username as a &string; if the userinfo component exists, &null; is returned otherwise.
   </simpara>
  </refsect1>
 
@@ -36,16 +37,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://us%65r:password@example.com");
 
 echo $uri->getRawUsername();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-user
+us%65r
 ]]>
    </screen>
   </example>

From 6030aadc53929bf733f93e0efb19ffb60547f0fb Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:38:12 +0300
Subject: [PATCH 32/41] getscheme.xml Describe normalization + show how the
 method works

---
 reference/uri/uri/rfc3986/uri/getscheme.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getscheme.xml b/reference/uri/uri/rfc3986/uri/getscheme.xml
index 81ad886924a7..1bce56e0f24b 100644
--- a/reference/uri/uri/rfc3986/uri/getscheme.xml
+++ b/reference/uri/uri/rfc3986/uri/getscheme.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized scheme component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com");
+
+$uri = new \Uri\Rfc3986\Uri("httpS://example.com");
 
 echo $uri->getScheme();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 29405aa538f4f45ec75aa0a382d26c3a39111937 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:41:52 +0300
Subject: [PATCH 33/41] getuserinfo.xml Describe normalization + show how the
 method works

---
 reference/uri/uri/rfc3986/uri/getuserinfo.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getuserinfo.xml b/reference/uri/uri/rfc3986/uri/getuserinfo.xml
index cd8cf4b9975e..1b4321ff67c5 100644
--- a/reference/uri/uri/rfc3986/uri/getuserinfo.xml
+++ b/reference/uri/uri/rfc3986/uri/getuserinfo.xml
@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized userinfo component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://user:p%61ssword@example.com");
 
 echo $uri->getUserInfo();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From b306af8c936683d14d983f2dc3c0f7292f7c66c6 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 21:49:49 +0300
Subject: [PATCH 34/41] getusername.xml Describe normalization + show how the
 method works

---
 reference/uri/uri/rfc3986/uri/getusername.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/getusername.xml b/reference/uri/uri/rfc3986/uri/getusername.xml
index 717753632e8b..d3eca5ea32cd 100644
--- a/reference/uri/uri/rfc3986/uri/getusername.xml
+++ b/reference/uri/uri/rfc3986/uri/getusername.xml
@@ -15,6 +15,7 @@
    Retrieves the normalized username part (the text before the first <literal>:</literal> character)
    from the userinfo component.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -36,10 +37,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://user:password@example.com");
+
+$uri = new \Uri\Rfc3986\Uri("https://us%65r:password@example.com");
 
 echo $uri->getUsername();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 93111f486c2e53b3c7fa1d6ec217cf8d20476c4f Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 22:03:23 +0300
Subject: [PATCH 35/41] Update language-snippets.ent

---
 language-snippets.ent | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 1cb275187db3..86d703de5102 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -4755,13 +4755,13 @@ local: {
 
 <!ENTITY uri.normalization '
   <simpara>
-   Hexadecimal triplets are converted to uppercase, and percent-encoded unreserved characters are decoded.
+   Hexadecimal triplets are converted to uppercase, percent-encoded unreserved characters are decoded, and the scheme and host components are normalized to lowercase per RFC 3986.
   </simpara>
 '>
 
 <!ENTITY uri.non-normalization '
   <simpara>
-   Hexadecimal triplets are not converted to uppercase, and percent-encoded unreserved characters are not decoded.
+   Components are returned in their original form; hexadecimal triplets are not converted to uppercase, unreserved characters remain encoded, and case folding is not applied.
   </simpara>
 '>
 

From cd27883238dce465bf03d64450798b5148d765e6 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 22:08:49 +0300
Subject: [PATCH 36/41] Update parse.xml Add missed `;`

---
 reference/uri/uri/rfc3986/uri/parse.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/parse.xml b/reference/uri/uri/rfc3986/uri/parse.xml
index dfd03e2aebaa..80e68a4070a8 100644
--- a/reference/uri/uri/rfc3986/uri/parse.xml
+++ b/reference/uri/uri/rfc3986/uri/parse.xml
@@ -56,14 +56,14 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = \Uri\Rfc3986\Uri::parse("https://example.com");
 
 if ($uri !== null) {
     echo "Valid URI: " . $uri->toString();
 } else {
-    echo "Invalid URI"
+    echo "Invalid URI";
 }
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 3de375d82c173bf0fd36e9e8c01e920a178f5373 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 22:32:13 +0300
Subject: [PATCH 37/41] resolve.xml The method works not only with URLs

---
 reference/uri/uri/rfc3986/uri/resolve.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/resolve.xml b/reference/uri/uri/rfc3986/uri/resolve.xml
index 68f162ba0ee2..4e028cf14294 100644
--- a/reference/uri/uri/rfc3986/uri/resolve.xml
+++ b/reference/uri/uri/rfc3986/uri/resolve.xml
@@ -2,7 +2,7 @@
 <refentry xml:id="uri-rfc3986-uri.resolve" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Uri\Rfc3986\Uri::resolve</refname>
-  <refpurpose>Resolve a URI with the current object as the base URL</refpurpose>
+  <refpurpose>Resolve a URI with the current object as the base URI</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -12,7 +12,7 @@
    <methodparam><type>string</type><parameter>uri</parameter></methodparam>
   </methodsynopsis>
   <simpara>
-   Resolves a URI - which may potentially be a relative reference - with the current object as the base URL.
+   Resolves a URI - which may potentially be a relative reference - with the current object as the base URI.
   </simpara>
  </refsect1>
 
@@ -49,11 +49,11 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+
 $uri = new \Uri\Rfc3986\Uri("https://example.com");
 $uri = $uri->resolve("/foo");
 
 echo $uri->toRawString();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 4ae8ce4c9fea8b134de7534105478a9999ca5b63 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 22:41:39 +0300
Subject: [PATCH 38/41] torawstring.xml Describe non-normalization + show how
 the method works

---
 reference/uri/uri/rfc3986/uri/torawstring.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/torawstring.xml b/reference/uri/uri/rfc3986/uri/torawstring.xml
index b8ccbe91d6d2..b7bb60bd5f4f 100644
--- a/reference/uri/uri/rfc3986/uri/torawstring.xml
+++ b/reference/uri/uri/rfc3986/uri/torawstring.xml
@@ -14,6 +14,7 @@
   <simpara>
    Recomposes the raw (non-normalized) URI to a &string;.
   </simpara>
+  &uri.non-normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -24,7 +25,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
-   Returns the recomposed raw (non-normalized) URI as a &string;.
+   Returns the recomposed raw URI as a &string;.
   </simpara>
  </refsect1>
 
@@ -35,16 +36,16 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar?baz");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r?baz");
 
 echo $uri->toRawString();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-https://example.com/foo/bar?baz
+https://example.com/foo/b%61r?baz
 ]]>
    </screen>
   </example>

From 9558fd5a83cbb5e93cadf78e14ac7d7d40cef0af Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 22:45:03 +0300
Subject: [PATCH 39/41] tostring.xml Describe normalization + show how to
 method works

---
 reference/uri/uri/rfc3986/uri/tostring.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reference/uri/uri/rfc3986/uri/tostring.xml b/reference/uri/uri/rfc3986/uri/tostring.xml
index 713d44c50181..b370c128a7ad 100644
--- a/reference/uri/uri/rfc3986/uri/tostring.xml
+++ b/reference/uri/uri/rfc3986/uri/tostring.xml
@@ -14,6 +14,7 @@
   <simpara>
    Recomposes the normalized URI to a &string;.
   </simpara>
+  &uri.normalization;
  </refsect1>
 
  <refsect1 role="parameters">
@@ -35,10 +36,10 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/bar?baz");
+
+$uri = new \Uri\Rfc3986\Uri("https://example.com/foo/b%61r?baz");
 
 echo $uri->toString();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 460a138678c4c5ba41a667aa6279cfae4d8d2151 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Sun, 17 May 2026 23:06:40 +0300
Subject: [PATCH 40/41] Update withfragment.xml Add `<?php` tag

---
 reference/uri/uri/rfc3986/uri/withfragment.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/reference/uri/uri/rfc3986/uri/withfragment.xml b/reference/uri/uri/rfc3986/uri/withfragment.xml
index 287bcf812b77..b0345bb362df 100644
--- a/reference/uri/uri/rfc3986/uri/withfragment.xml
+++ b/reference/uri/uri/rfc3986/uri/withfragment.xml
@@ -48,11 +48,12 @@
    <title><methodname>Uri\Rfc3986\Uri::withFragment</methodname> basic example</title>
    <programlisting role="php">
 <![CDATA[
+<?php
+
 $uri = new \Uri\Rfc3986\Uri("https://example.com/#foo");
 $uri = $uri->withFragment("bar");
 
 echo $uri->getFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;

From 52b494a691985e3674f2efd2ef590d0c5d3208b8 Mon Sep 17 00:00:00 2001
From: Mikhail Alferov <malferov@gmail.com>
Date: Mon, 18 May 2026 02:08:40 +0300
Subject: [PATCH 41/41] uri.whatwg.urlvalidationerrortype.xml Add missing desc

---
 reference/uri/uri.whatwg.urlvalidationerrortype.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/uri/uri.whatwg.urlvalidationerrortype.xml b/reference/uri/uri.whatwg.urlvalidationerrortype.xml
index f2e58f029701..eb4bf52a071b 100644
--- a/reference/uri/uri.whatwg.urlvalidationerrortype.xml
+++ b/reference/uri/uri.whatwg.urlvalidationerrortype.xml
@@ -105,7 +105,7 @@
 
      <enumitem>
       <enumidentifier>Ipv4InIpv6InvalidCodePoint</enumidentifier>
-      <enumitemdescription>An IPv6 address with IPv4 address syntax.</enumitemdescription>
+      <enumitemdescription>An IPv6 address with IPv4 address syntax: an IPv4 part contains an invalid code point.</enumitemdescription>
      </enumitem>
 
      <enumitem>