Improve implementation

Author: nyamsprod

src/Rfc3986/Uri.php

@@ -45,8 +45,9 @@ final class Uri
         private readonly array $rawComponents;
         private readonly string $rawUri;
         /** @var Components */
-        private array $normalizedComponents;
-        private ?string $normalizedUri;
+        private array $normalizedComponents = self::DEFAULT_COMPONENTS;
+        private ?string $normalizedUri = null;
+        private bool $isNormalized;
 
         /**
          * @throws InvalidUriException
@@ -65,8 +66,7 @@ public function __construct(string $uri, ?string $baseUri = null)
 
             $this->rawComponents = self::addUserInfo($components);
             $this->rawUri = $uri;
-            $this->normalizedUri = null;
-            $this->normalizedComponents = self::DEFAULT_COMPONENTS;
+            $this->isNormalized = false;
         }
 
         /**
@@ -119,10 +119,11 @@ public static function parse(string $uri, ?string $baseUri = null): ?Uri
 
         private function setNormalizedComponents(): void
         {
-            if (self::DEFAULT_COMPONENTS === $this->normalizedComponents) {
+            if (!$this->isNormalized) {
                 $this->normalizedComponents = self::addUserInfo(UriString::parseNormalized($this->toRawString()));
                 // We convert the host separately because the current RFC does not handle IDNA
                 $this->normalizedComponents['host'] = Encoder::normalizeHost($this->rawComponents['host']);
+                $this->isNormalized = true;
             }
         }
 
@@ -389,8 +390,7 @@ public function __unserialize(array $data): void
 
             $this->rawComponents = $uri->rawComponents;
             $this->rawUri = $uri->rawUri;
-            $this->normalizedComponents = self::DEFAULT_COMPONENTS;
-            $this->normalizedUri = null;
+            $this->isNormalized = false;
         }
 
         /**

tests/Rfc3986/UriTest.php

@@ -118,7 +118,8 @@ public function it_will_normalize_the_uri_according_to_rfc3986(): void
     {
         $uri = new Uri("https://[2001:0db8:0001:0000:0000:0ab9:C0A8:0102]/?foo=bar%26baz%3Dqux");
 
-        self::assertSame('[2001:0db8:0001:0000:0000:0ab9:C0A8:0102]', $uri->getHost());
+        self::assertSame('[2001:0db8:0001:0000:0000:0ab9:C0A8:0102]', $uri->getRawHost());
+        self::assertSame('[2001:0db8:0001:0000:0000:0ab9:c0a8:0102]', $uri->getHost());
         self::assertSame('foo=bar%26baz%3Dqux', $uri->getQuery());
         self::assertSame('foo=bar%26baz%3Dqux', $uri->getRawQuery());
     }
@@ -192,7 +193,7 @@ public function it_can_be_check_for_equivalent(): void
         $uri1 = new Uri('http://example.com#foobar');
         $uri2 = new Uri('http://example.com');
 
-        self::assertTrue($uri1->equals($uri2, true));
+        self::assertTrue($uri1->equals($uri2));
         self::assertFalse($uri1->equals($uri2, false));
     }