Adding support for PHP native RFC3986 URI parser

Author: nyamsprod

components/CHANGELOG.md

@@ -23,6 +23,7 @@ All Notable changes to `League\Uri\Components` will be documented in this file
 - `Fragment::normalized`
 - `HierarchicalPath::normalized`
 - `Datapath::normalized`
+- Support for `Uri\Rfc3986\Uri`
 
 ### Fixed
 

components/Components/Authority.php

@@ -78,7 +78,7 @@ public static function tryNew(Stringable|string|null $uri = null): ?self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
         $uri = self::filterUri($uri);
 

components/Components/Component.php

@@ -22,6 +22,7 @@
 use League\Uri\Uri;
 use Psr\Http\Message\UriInterface as Psr7UriInterface;
 use Stringable;
+use Uri\Rfc3986\Uri as Rfc3986Uri;
 
 use function is_bool;
 use function preg_match;
@@ -53,7 +54,7 @@ public function getUriComponent(): string
         return $this->toString();
     }
 
-    final protected static function filterUri(Stringable|string $uri): UriInterface|Psr7UriInterface
+    final protected static function filterUri(Rfc3986Uri|Stringable|string $uri): UriInterface|Psr7UriInterface
     {
         return match (true) {
             $uri instanceof UriAccess => $uri->getUri(),

components/Components/DataPath.php

@@ -222,7 +222,7 @@ public static function fromFileContents(string $path, $context = null): self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
         return self::new(Path::fromUri($uri)->toString());
     }

components/Components/Domain.php

@@ -98,7 +98,7 @@ public static function fromLabels(Stringable|string ...$labels): self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
         return self::new(Host::fromUri($uri));
     }

components/Components/Fragment.php

@@ -54,8 +54,12 @@ public static function tryNew(Stringable|string|null $uri = null): ?self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
+        if ($uri instanceof \Uri\Rfc3986\Uri) {
+            return new self($uri->getRawFragment());
+        }
+
         $uri = self::filterUri($uri);
 
         return match (true) {

components/Components/HierarchicalPath.php

@@ -95,7 +95,7 @@ public static function tryNew(Stringable|string $uri = ''): ?self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
         return new self(Path::fromUri($uri));
     }

components/Components/Host.php

@@ -309,8 +309,12 @@ public static function fromIp(Stringable|string $ip, string $version = ''): self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
+        if ($uri instanceof \Uri\Rfc3986\Uri) {
+            return new self($uri->getRawHost());
+        }
+
         $uri = self::filterUri($uri);
 
         return match (true) {

components/Components/Path.php

@@ -56,7 +56,7 @@ public static function new(Stringable|string $value = ''): self
     }
 
     /**
-     * Create a new instance from a string.or a stringable structure or returns null on failure.
+     * Create a new instance from a string or a stringable structure or returns null on failure.
      */
     public static function tryNew(Stringable|string $uri = ''): ?self
     {
@@ -70,8 +70,12 @@ public static function tryNew(Stringable|string $uri = ''): ?self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
+        if ($uri instanceof \Uri\Rfc3986\Uri) {
+            return self::new($uri->getRawPath());
+        }
+
         if (!$uri instanceof UriInterface) {
             $uri = Uri::new($uri);
         }

components/Components/Port.php

@@ -58,8 +58,12 @@ public static function tryNew(Stringable|string|null $uri = null): ?self
     /**
      * Create a new instance from a URI object.
      */
-    public static function fromUri(Stringable|string $uri): self
+    public static function fromUri(\Uri\Rfc3986\Uri|Stringable|string $uri): self
     {
+        if ($uri instanceof \Uri\Rfc3986\Uri) {
+            return new self($uri->getPort());
+        }
+
         return new self(self::filterUri($uri)->getPort());
     }