Adding IPv6 compression to BaseUri

docs/uri/7.0/base-uri.md

@@ -30,6 +30,17 @@ echo $baseUri; // display 'http://www.example.com'
 
 The instance also implements PHP's `Stringable` and `JsonSerializable` interface.
 
+In addition to all the non-destructive rules from RFC3968, duting instantiation, the class
+will convert the host if possible:
+
+- to its IPv4 decimal representation
+- to its compressed IPv6 representation (since version **7.5**)
+
+```php
+BaseUri::from('https://0:443/')->getUriString(); // returns 'https://0.0.0.0/
+BaseUri::from('FtP://[1050:0000:0000:0000:0005:0000:300c:326b]/path')->getUriString(); // returns 'ftp://[1050::5:0:300c:326b]/path
+```
+
 ## URI resolution
 
 The `BaseUri::resolve` resolves a URI as a browser would for a relative URI while

uri/BaseUri.php

@@ -19,6 +19,7 @@
 use League\Uri\Exceptions\MissingFeature;
 use League\Uri\Idna\Converter;
 use League\Uri\IPv4\Converter as IPv4Converter;
+use League\Uri\IPv6\Converter as IPv6Converter;
 use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface as Psr7UriInterface;
 use Stringable;
@@ -556,6 +557,10 @@ final protected static function formatHost(Psr7UriInterface|UriInterface $uri):
             $converted = null;
         }
 
+        if (false === filter_var($converted, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+            $converted = IPv6Converter::compress($host);
+        }
+
         return match (true) {
             null !== $converted => $uri->withHost($converted),
             '' === $host,

uri/BaseUriTest.php

@@ -360,6 +360,10 @@ public static function getOriginProvider(): array
                 'uri' => Uri::new('https://0:443/'),
                 'expectedOrigin' => 'https://0.0.0.0',
             ],
+            'compressed ipv6' => [
+                'uri' => 'https://[1050:0000:0000:0000:0005:0000:300c:326b]:443/',
+                'expectedOrigin' => 'https://[1050::5:0:300c:326b]',
+            ],
         ];
     }
 

uri/CHANGELOG.md

@@ -14,6 +14,7 @@ All Notable changes to `League\Uri` will be documented in this file
 
 - Adding `SensitiveParameter` attribute in the `Uri` and the `BaseUri` class.
 - Improve PSR-7 `Http` class implementation.
+- `BaseUri::from` will compress the IPv6 host to its compressed form if possible.
 
 ### Deprecated