UrlImmutable, UrlScript: removed build() method

Author: dg

src/Http/UrlImmutable.php

@@ -50,7 +50,7 @@ class UrlImmutable implements \JsonSerializable
 	private string $path = '';
 	private array $query = [];
 	private string $fragment = '';
-	private string $authority = '';
+	private ?string $authority = null;
 
 
 	/**
@@ -60,15 +60,14 @@ public function __construct(string|self|Url $url)
 	{
 		$url = is_string($url) ? new Url($url) : $url;
 		[$this->scheme, $this->user, $this->password, $this->host, $this->port, $this->path, $this->query, $this->fragment] = $url->export();
-		$this->build();
 	}
 
 
 	public function withScheme(string $scheme): static
 	{
 		$dolly = clone $this;
 		$dolly->scheme = $scheme;
-		$dolly->build();
+		$dolly->authority = null;
 		return $dolly;
 	}
 
@@ -83,7 +82,7 @@ public function withUser(string $user): static
 	{
 		$dolly = clone $this;
 		$dolly->user = $user;
-		$dolly->build();
+		$dolly->authority = null;
 		return $dolly;
 	}
 
@@ -98,7 +97,7 @@ public function withPassword(string $password): static
 	{
 		$dolly = clone $this;
 		$dolly->password = $password;
-		$dolly->build();
+		$dolly->authority = null;
 		return $dolly;
 	}
 
@@ -113,7 +112,7 @@ public function withoutUserInfo(): static
 	{
 		$dolly = clone $this;
 		$dolly->user = $dolly->password = '';
-		$dolly->build();
+		$dolly->authority = null;
 		return $dolly;
 	}
 
@@ -122,8 +121,8 @@ public function withHost(string $host): static
 	{
 		$dolly = clone $this;
 		$dolly->host = $host;
-		$dolly->build();
-		return $dolly;
+		$dolly->authority = null;
+		return $dolly->setPath($dolly->path);
 	}
 
 
@@ -149,7 +148,7 @@ public function withPort(int $port): static
 	{
 		$dolly = clone $this;
 		$dolly->port = $port;
-		$dolly->build();
+		$dolly->authority = null;
 		return $dolly;
 	}
 
@@ -168,10 +167,14 @@ public function getDefaultPort(): ?int
 
 	public function withPath(string $path): static
 	{
-		$dolly = clone $this;
-		$dolly->path = $path;
-		$dolly->build();
-		return $dolly;
+		return (clone $this)->setPath($path);
+	}
+
+
+	private function setPath(string $path): static
+	{
+		$this->path = $this->host && !str_starts_with($path, '/') ? '/' . $path : $path;
+		return $this;
 	}
 
 
@@ -185,7 +188,6 @@ public function withQuery(string|array $query): static
 	{
 		$dolly = clone $this;
 		$dolly->query = is_array($query) ? $query : Url::parseQuery($query);
-		$dolly->build();
 		return $dolly;
 	}
 
@@ -220,7 +222,6 @@ public function withFragment(string $fragment): static
 	{
 		$dolly = clone $this;
 		$dolly->fragment = $fragment;
-		$dolly->build();
 		return $dolly;
 	}
 
@@ -247,7 +248,15 @@ public function getAbsoluteUrl(): string
 	 */
 	public function getAuthority(): string
 	{
-		return $this->authority;
+		return $this->authority ??= $this->host === ''
+			? ''
+			: ($this->user !== ''
+				? rawurlencode($this->user) . ($this->password === '' ? '' : ':' . rawurlencode($this->password)) . '@'
+				: '')
+			. $this->host
+			. ($this->port && $this->port !== $this->getDefaultPort()
+				? ':' . $this->port
+				: '');
 	}
 
 
@@ -256,8 +265,8 @@ public function getAuthority(): string
 	 */
 	public function getHostUrl(): string
 	{
-		return ($this->scheme ? $this->scheme . ':' : '')
-			. ($this->authority !== '' ? '//' . $this->authority : '');
+		return ($this->scheme === '' ? '' : $this->scheme . ':')
+			. ($this->host === '' ? '' : '//' . $this->getAuthority());
 	}
 
 
@@ -284,22 +293,4 @@ final public function export(): array
 	{
 		return [$this->scheme, $this->user, $this->password, $this->host, $this->port, $this->path, $this->query, $this->fragment];
 	}
-
-
-	protected function build(): void
-	{
-		if ($this->host && !str_starts_with($this->path, '/')) {
-			$this->path = '/' . $this->path;
-		}
-
-		$this->authority = $this->host === ''
-			? ''
-			: ($this->user !== ''
-				? rawurlencode($this->user) . ($this->password === '' ? '' : ':' . rawurlencode($this->password)) . '@'
-				: '')
-			. $this->host
-			. ($this->port && $this->port !== $this->getDefaultPort()
-				? ':' . $this->port
-				: '');
-	}
 }

src/Http/UrlScript.php

@@ -40,18 +40,30 @@ class UrlScript extends UrlImmutable
 
 	public function __construct(string|Url $url = '/', string $scriptPath = '')
 	{
-		$this->scriptPath = $scriptPath;
 		parent::__construct($url);
-		$this->build();
+		$this->setScriptPath($scriptPath);
 	}
 
 
 	public function withPath(string $path, string $scriptPath = ''): static
 	{
-		$dolly = clone $this;
-		$dolly->scriptPath = $scriptPath;
-		$parent = UrlImmutable::withPath(...)->bindTo($dolly);
-		return $parent($path);
+		$dolly = parent::withPath($path);
+		$dolly->setScriptPath($scriptPath);
+		return $dolly;
+	}
+
+
+	private function setScriptPath(string $scriptPath): void
+	{
+		$path = $this->getPath();
+		$scriptPath = $scriptPath ?: $path;
+		$pos = strrpos($scriptPath, '/');
+		if ($pos === false || strncmp($scriptPath, $path, $pos + 1)) {
+			throw new Nette\InvalidArgumentException("ScriptPath '$scriptPath' doesn't match path '$path'");
+		}
+
+		$this->scriptPath = $scriptPath;
+		$this->basePath = substr($scriptPath, 0, $pos + 1);
 	}
 
 
@@ -94,16 +106,4 @@ public function getPathInfo(): string
 	}
 
 
-	protected function build(): void
-	{
-		parent::build();
-		$path = $this->getPath();
-		$this->scriptPath = $this->scriptPath ?: $path;
-		$pos = strrpos($this->scriptPath, '/');
-		if ($pos === false || strncmp($this->scriptPath, $path, $pos + 1)) {
-			throw new Nette\InvalidArgumentException("ScriptPath '$this->scriptPath' doesn't match path '$path'");
-		}
-
-		$this->basePath = substr($this->scriptPath, 0, $pos + 1);
-	}
 }