Update UriTemplate API to keep te method consistent

Author: nyamsprod

phpunit.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="true"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+>
   <coverage>
     <report>
       <clover outputFile="build/clover.xml"/>

polyfill/Polyfill/UrlTest.php

@@ -347,4 +347,24 @@ public function it_will_update_the_port_and_the_scheme(): void
         self::assertTrue($resScheme->equals($resSchemeDot));
         self::assertTrue($resSchemeDot->equals($resSchemeDotSlashes));
     }
+
+    public function test_it_will_return_the_host_correct_format(): void
+    {
+        $uri = new Url('https://bébé.be');
+
+        self::assertSame('https://xn--bb-bjab.be/', $uri->toAsciiString());
+        self::assertSame('https://bébé.be/', $uri->toUnicodeString());
+
+        self::assertSame('xn--bb-bjab.be', $uri->getAsciiHost());
+        self::assertSame('bébé.be', $uri->getUnicodeHost());
+
+        $uri = new Url('https://xn--bb-bjab.be');
+
+        self::assertSame('https://xn--bb-bjab.be/', $uri->toAsciiString());
+        self::assertSame('https://bébé.be/', $uri->toUnicodeString());
+
+        self::assertSame('xn--bb-bjab.be', $uri->getAsciiHost());
+        self::assertSame('bébé.be', $uri->getUnicodeHost());
+    }
+
 }

polyfill/lib/WhatWg/Url.php

@@ -27,6 +27,7 @@
 use Uri\UriComparisonMode;
 
 use function in_array;
+use function preg_match;
 use function substr;
 
 use const PHP_VERSION_ID;
@@ -44,12 +45,18 @@ final class Url
     {
         private const PORT_RANGE_MIN = 0;
         private const PORT_RANGE_MAX = 65535;
+        private const REGEXP_IDNA_PATTERN = '/[^\x20-\x7f]/';
 
         private WhatWgURL $url;
+
         private ?string $unicodeHost = null;
         private bool $unicodeHostInitialized = false;
         private ?string $urlUnicodeString = null;
 
+        private ?string $asciiHost = null;
+        private bool $asciiHostInitialized = false;
+        private ?string $urlAsciiString = null;
+
         /**
          * @param list<UrlValidationError> $errors
          */
@@ -167,7 +174,14 @@ public function withPassword(#[SensitiveParameter] ?string $password): self
 
         public function getAsciiHost(): ?string
         {
-            return $this->url->hostname;
+            if ($this->asciiHostInitialized) {
+                return $this->asciiHost;
+            }
+
+            $this->asciiHost = $this->setAsciiHost();
+            $this->asciiHostInitialized = true;
+
+            return $this->asciiHost;
         }
 
         public function getUnicodeHost(): ?string
@@ -210,6 +224,29 @@ private function setUnicodeHost(): ?string
             return $result->getDomain();
         }
 
+        private function setAsciiHost(): ?string
+        {
+            $host = $this->url->hostname;
+            if ('' === $host || null === $host || 1 !== preg_match(self::REGEXP_IDNA_PATTERN, $host)) {
+                return $host;
+            }
+
+            $result = Idna::toAscii($host, [
+                'CheckHyphens' => false,
+                'CheckBidi' => true,
+                'CheckJoiners' => true,
+                'UseSTD3ASCIIRules' => false,
+                'Transitional_Processing' => false,
+                'IgnoreInvalidPunycode' => false,
+            ]);
+
+            if ($result->hasErrors()) {
+                return $host;
+            }
+
+            return $result->getDomain();
+        }
+
         /**
          * @throws InvalidUrlException
          */
@@ -355,7 +392,22 @@ private static function urlRecord(self $url): URLRecord
 
         public function toAsciiString(): string
         {
-            return $this->url->href;
+            if (null !== $this->urlAsciiString) {
+                return $this->urlAsciiString;
+            }
+
+            $asciiHost = $this->getAsciiHost();
+            if (null === $asciiHost || $this->getUnicodeHost() === $asciiHost) {
+                $this->urlAsciiString = $this->url->href;
+
+                return $this->urlAsciiString;
+            }
+
+            $urlRecord = self::urlRecord($this);
+            $urlRecord->host = new StringHost($asciiHost);
+            $this->urlAsciiString = $urlRecord->serializeURL();
+
+            return $this->urlAsciiString;
         }
 
         public function toUnicodeString(): string