Uri Fix classname and extra e.g., amend examples, describe normalization

language-snippets.ent

@@ -4753,6 +4753,18 @@ local: {
   </simpara>
 '>
 
+<!ENTITY uri.normalization '
+  <simpara>
+   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>
+   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>
+'>
+
 <!-- UOPZ snippets -->
 
 <!ENTITY uopz.warn.removed.function-5-0-0 '<warning

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>

reference/uri/uri/rfc3986/uri/getfragment.xml

@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized fragment component.
   </simpara>
+  &uri.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#%5bfoo%2db%61r%5d");
 
 echo $uri->getFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+%5Bfoo-bar%5D
 ]]>
    </screen>
   </example>

reference/uri/uri/rfc3986/uri/gethost.xml

@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized host 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://ex%61mple.com");
 
 echo $uri->getHost();
-?>
 ]]>
    </programlisting>
    &example.outputs;

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">

reference/uri/uri/rfc3986/uri/getpath.xml

@@ -14,6 +14,7 @@
   <simpara>
    Retrieves the normalized path 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->getPath();
-?>
 ]]>
    </programlisting>
    &example.outputs;

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;

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;

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">
@@ -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->getRawFragment();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-foo=bar
+foo=b%61r
 ]]>
    </screen>
   </example>

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,16 +36,16 @@
    <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();
-?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
-example.com
+ex%61mple.com
 ]]>
    </screen>
   </example>

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">
@@ -25,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>
@@ -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>

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>

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>

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>

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>