Prepare release

Author: nyamsprod

phpunit.xml

@@ -17,7 +17,7 @@
     </report>
   </coverage>
   <testsuites>
-    <testsuite name="URI Test Suite">
+    <testsuite name="PHP URI ToolKit Test Suite">
       <directory suffix="Test.php">uri</directory>
       <directory suffix="Test.php">components</directory>
       <directory suffix="Test.php">interfaces</directory>
@@ -37,7 +37,6 @@
     <exclude>
       <directory suffix="Bench.php">uri</directory>
       <directory suffix="Test.php">uri</directory>
-      <directory suffix="TestCase.php">uri</directory>
       <directory suffix="Bench.php">components</directory>
       <directory suffix="Test.php">components</directory>
       <directory suffix="Bench.php">interfaces</directory>

uri/CHANGELOG.md

@@ -30,8 +30,8 @@ All Notable changes to `League\Uri` will be documented in this file
 - `Uri::withUsername` returns a new `Uri` instance with the updated username component.
 - `Uri::withPassword` returns a new `Uri` instance with the updated password component.
 - `Uri::toAsciiString` returns the URI string representation as per RFC3986
-- `Uri::toAsciiString` returns the URI string representation as per RFC3987 with the host in unicode form if available
-- `Uri::getUnicodeHost` returns the host in Unicode form if available; fallback to its RFC39 86 representation otherwise
+- `Uri::toAsciiString` returns the URI string representation as per RFC3987 with the host in Unicode form if available
+- `Uri::getUnicodeHost` returns the host in Unicode form if available; fallback to its RFC3986 representation otherwise
 - `UriTemplate` implements the `Stringable` interface
 - `UriTemplate::expandToUri` and `UriTemplate::expandToUriOrFail`
 - `UriTemplate::expandToUrl` and `UriTemplate::expandToUrlOrFail`

uri/Uri.php

@@ -888,6 +888,34 @@ private static function formatFilePath(string $path): string
         );
     }
 
+    /**
+     * assert the URI internal state is valid.
+     *
+     * @link https://tools.ietf.org/html/rfc3986#section-3
+     * @link https://tools.ietf.org/html/rfc3986#section-3.3
+     *
+     * @throws SyntaxError if the URI is in an invalid state, according to RFC3986
+     */
+    private function assertValidRfc3986Uri(): void
+    {
+        if (null !== $this->authority && ('' !== $this->path && '/' !== $this->path[0])) {
+            throw new SyntaxError('If an authority is present the path must be empty or start with a `/`.');
+        }
+
+        if (null === $this->authority && str_starts_with($this->path, '//')) {
+            throw new SyntaxError('If there is no authority the path `' . $this->path . '` cannot start with a `//`.');
+        }
+
+        $pos = strpos($this->path, ':');
+        if (null === $this->authority
+            && null === $this->scheme
+            && false !== $pos
+            && !str_contains(substr($this->path, 0, $pos), '/')
+        ) {
+            throw new SyntaxError('In absence of a scheme and an authority the first path segment cannot contain a colon (":") character.');
+        }
+    }
+
     /**
      * assert the URI scheme is valid
      *
@@ -946,34 +974,6 @@ private function assertValidState(): void
         } || throw new SyntaxError('The uri `'.$this->uriAsciiString.'` is invalid for the `'.$this->scheme.'` scheme.');
     }
 
-    /**
-     * assert the URI internal state is valid.
-     *
-     * @link https://tools.ietf.org/html/rfc3986#section-3
-     * @link https://tools.ietf.org/html/rfc3986#section-3.3
-     *
-     * @throws SyntaxError if the URI is in an invalid state, according to RFC3986
-     */
-    private function assertValidRfc3986Uri(): void
-    {
-        if (null !== $this->authority && ('' !== $this->path && '/' !== $this->path[0])) {
-            throw new SyntaxError('If an authority is present the path must be empty or start with a `/`.');
-        }
-
-        if (null === $this->authority && str_starts_with($this->path, '//')) {
-            throw new SyntaxError('If there is no authority the path `' . $this->path . '` cannot start with a `//`.');
-        }
-
-        $pos = strpos($this->path, ':');
-        if (null === $this->authority
-            && null === $this->scheme
-            && false !== $pos
-            && !str_contains(substr($this->path, 0, $pos), '/')
-        ) {
-            throw new SyntaxError('In absence of a scheme and an authority the first path segment cannot contain a colon (":") character.');
-        }
-    }
-
     private function isValidBlob(): bool
     {
         static $regexpUuidRfc4122 = '/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i';