Improve package namespaces

thephpleague · Aug 3, 2023 · 44f3e3e · 44f3e3e
1 parent a45c213
commit 44f3e3e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/BaseUri.php b/BaseUri.php
@@ -16,8 +16,8 @@
 use JsonSerializable;
 use League\Uri\Contracts\UriAccess;
 use League\Uri\Contracts\UriInterface;
-use League\Uri\IPv4\IPv4Converter;
-use League\Uri\IPv4\MissingIPv4Calculator;
+use League\Uri\IPv4\Converter;
+use League\Uri\IPv4\MissingCalculator;
 use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface as Psr7UriInterface;
 use Stringable;
@@ -432,8 +432,8 @@ private static function formatHost(Psr7UriInterface|UriInterface $uri): Psr7UriI
     {
         $host = $uri->getHost();
         try {
-            $converted = IPv4Converter::fromEnvironment()($host);
-        } catch (MissingIPv4Calculator) {
+            $converted = Converter::fromEnvironment()($host);
+        } catch (MissingCalculator) {
             $converted = null;
         }
 

diff --git a/Uri.php b/Uri.php
@@ -18,9 +18,8 @@
 use League\Uri\Contracts\UriException;
 use League\Uri\Contracts\UriInterface;
 use League\Uri\Exceptions\FileinfoSupportMissing;
-use League\Uri\Exceptions\IdnaConversionFailed;
-use League\Uri\Exceptions\IdnSupportMissing;
 use League\Uri\Exceptions\SyntaxError;
+use League\Uri\Idna\ConversionFailed;
 use League\Uri\Idna\Idna;
 use League\Uri\UriTemplate\TemplateCanNotBeExpanded;
 use Psr\Http\Message\UriInterface as Psr7UriInterface;
@@ -332,17 +331,17 @@ private function formatHost(?string $host): ?string
      *
      * The host is converted to its ascii representation if needed
      *
-     * @throws IdnSupportMissing if the submitted host required missing or misconfigured IDN support
-     * @throws SyntaxError       if the submitted host is not a valid registered name
+     * @throws \League\Uri\Idna\MissingSupport if the submitted host required missing or misconfigured IDN support
+     * @throws SyntaxError                     if the submitted host is not a valid registered name
      */
     private function formatRegisteredName(string $host): string
     {
         $formatter = static function (string $host) {
-            $info = Idna::toAscii($host);
+            $result = Idna::toAscii($host);
 
             return match (true) {
-                $info->hasErrors() => throw IdnaConversionFailed::dueToIDNAError($host, $info),
-                default => $info->domain(),
+                $result->hasErrors() => throw ConversionFailed::dueToError($host, $result),
+                default => $result->domain(),
             };
         };
         $formattedHost = rawurldecode($host);
@@ -435,7 +434,7 @@ public static function new(Stringable|string $uri = ''): self
      */
     public static function fromBaseUri(Stringable|string $uri, Stringable|string|null $baseUri = null): self
     {
-        $uri = self::new((string) $uri);
+        $uri = self::new($uri);
         $baseUri = BaseUri::from($baseUri ?? $uri);
 
         /** @var self $uri */

diff --git a/composer.json b/composer.json
@@ -56,14 +56,14 @@
         "league/uri-schemes": "^1.0"
     },
     "suggest": {
+        "ext-bcmath": "to improve IPV4 host parsing",
+        "ext-fileinfo": "to create Data URI from file contennts",
+        "ext-gmp": "to improve IPV4 host parsing",
         "ext-intl": "to handle IDN host with the best performance",
-        "ext-gmp": "to improve handle IPV4 parsing",
-        "ext-bcmath": "to improve handle IPV4 parsing",
-        "ext-fileinfo": "to create Data URI from a filepath",
         "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain",
-        "league/uri-components" : "Needed to easily manipulate URI objects",
-        "php-64bit": "to improve handle IPV4 parsing",
-        "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is missing"
+        "league/uri-components" : "Needed to easily manipulate URI objects components",
+        "php-64bit": "to improve IPV4 host parsing",
+        "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
     },
     "extra": {
         "branch-alias": {