UrlScript extends from UrlImmutable (BC break)

Author: dg

src/Http/Request.php

@@ -81,7 +81,7 @@ public function __construct(UrlScript $url, array $post = null, array $files = n
 	 */
 	public function getUrl(): UrlScript
 	{
-		return clone $this->url;
+		return $this->url;
 	}
 
 

src/Http/RequestFactory.php

@@ -62,15 +62,14 @@ public function setProxy($proxy)
 	 */
 	public function createHttpRequest(): Request
 	{
-		$url = new UrlScript;
+		$url = new Url;
 		$this->getServer($url);
 		$this->getPathAndQuery($url);
-		$this->getScriptPath($url);
 		[$post, $cookies] = $this->getGetPostCookie($url);
 		[$remoteAddr, $remoteHost] = $this->getClient($url);
 
 		return new Request(
-			$url,
+			new UrlScript($url, $this->getScriptPath($url)),
 			$post,
 			$this->getFiles(),
 			$cookies,
@@ -117,7 +116,7 @@ private function getPathAndQuery(Url $url): void
 	}
 
 
-	private function getScriptPath(Url $url): void
+	private function getScriptPath(Url $url): string
 	{
 		$path = $url->getPath();
 		$lpath = strtolower($path);
@@ -127,7 +126,7 @@ private function getScriptPath(Url $url): void
 			for ($i = 0; $i < $max && $lpath[$i] === $script[$i]; $i++);
 			$path = $i ? substr($path, 0, strrpos($path, '/', $i - strlen($path) - 1) + 1) : '/';
 		}
-		$url->setScriptPath($path);
+		return $path;
 	}
 
 

src/Http/UrlScript.php

@@ -11,68 +11,69 @@
 
 
 /**
- * Extended HTTP URL.
+ * Immutable representation of a URL with application base-path.
  *
  * <pre>
+ *      baseUrl    basePath  relativePath  relativeUrl
+ *         |          |        |               |
+ * /---------------/-----\/--------\-----------------------------\
  * http://nette.org/admin/script.php/pathinfo/?name=param#fragment
  *                 \_______________/\________/
  *                        |              |
  *                   scriptPath       pathInfo
  * </pre>
  *
- * - scriptPath:  /admin/script.php (or simply /admin/ when script is directory index)
- * - pathInfo:    /pathinfo/ (additional path information)
- *
- * @property   string $scriptPath
+ * @property-read string $scriptPath
+ * @property-read string $basePath
  * @property-read string $relativePath
+ * @property-read string $baseUrl
+ * @property-read string $relativeUrl
  * @property-read string $pathInfo
  */
-class UrlScript extends Url
+class UrlScript extends UrlImmutable
 {
 	/** @var string */
 	private $scriptPath;
 
+	/** @var string */
+	private $basePath;
+
 
-	public function __construct($url = null, string $scriptPath = '')
+	public function __construct($url = '/', string $scriptPath = '')
 	{
 		parent::__construct($url);
-		$this->setScriptPath($scriptPath);
+		$this->scriptPath = $scriptPath;
+		$this->build();
 	}
 
 
-	/**
-	 * Sets the script-path part of URI.
-	 * @return static
-	 */
-	public function setScriptPath(string $value)
+	public function getScriptPath(): string
 	{
-		$this->scriptPath = $value;
-		return $this;
+		return $this->scriptPath;
 	}
 
 
-	/**
-	 * Returns the script-path part of URI.
-	 */
-	public function getScriptPath(): string
+	public function getBasePath(): string
 	{
-		return $this->scriptPath ?: $this->path;
+		return $this->basePath;
 	}
 
 
 	public function getRelativePath(): string
 	{
-		return substr($this->getPath(), strrpos($this->scriptPath, '/') + 1);
+		return substr($this->getPath(), strlen($this->basePath));
 	}
 
 
-	/**
-	 * Returns the base-path.
-	 */
-	public function getBasePath(): string
+	public function getBaseUrl(): string
+	{
+		return $this->getHostUrl() . $this->basePath;
+	}
+
+
+	public function getRelativeUrl(): string
 	{
-		$pos = strrpos($this->getScriptPath(), '/');
-		return $pos === false ? '' : substr($this->getPath(), 0, $pos + 1);
+		return substr($this->getAbsoluteUrl(), strlen($this->getBaseUrl()));
 	}
 
 
@@ -81,6 +82,15 @@ public function getBasePath(): string
 	 */
 	public function getPathInfo(): string
 	{
-		return (string) substr($this->getPath(), strlen($this->getScriptPath()));
+		return (string) substr($this->getPath(), strlen($this->scriptPath));
+	}
+
+
+	protected function build(): void
+	{
+		parent::build();
+		$this->scriptPath = $this->scriptPath ?: $this->getPath();
+		$pos = strrpos($this->scriptPath, '/');
+		$this->basePath = $pos === false ? '' : substr($this->scriptPath, 0, $pos + 1);
 	}
 }

tests/Http/Request.getUrl.phpt

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Test: Nette\Http\UrlScript parse.
+ */
+
+declare(strict_types=1);
+
+use Nette\Http\UrlScript;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test(function () {
+	$url = new UrlScript('http://nette.org:8080/file.php?q=search');
+	Assert::same('/file.php', $url->scriptPath);
+	Assert::same('http://nette.org:8080/', $url->baseUrl);
+	Assert::same('/', $url->basePath);
+	Assert::same('file.php?q=search', $url->relativeUrl);
+	Assert::same('file.php', $url->relativePath);
+	Assert::same('', $url->pathInfo);
+});
+
+
+test(function () {
+	$url = new UrlScript('http://nette.org:8080/file.php?q=search', '/');
+	Assert::same('/', $url->scriptPath);
+	Assert::same('http://nette.org:8080/', $url->baseUrl);
+	Assert::same('/', $url->basePath);
+	Assert::same('file.php?q=search', $url->relativeUrl);
+	Assert::same('file.php', $url->relativePath);
+	Assert::same('file.php', $url->pathInfo);
+});
+
+
+test(function () {
+	$url = new UrlScript('http://nette.org:8080/test/?q=search', '/test/index.php');
+	Assert::same('/test/index.php', $url->scriptPath);
+	Assert::same('http://nette.org:8080/test/', $url->baseUrl);
+	Assert::same('/test/', $url->basePath);
+	Assert::same('?q=search', $url->relativeUrl);
+	Assert::same('', $url->relativePath);
+	Assert::same('', $url->pathInfo);
+	Assert::same('http://nette.org:8080/test/?q=search', $url->absoluteUrl);
+});
+
+
+test(function () {
+	$url = new UrlScript('http://nette.org:8080/www/about', '/www/');
+	Assert::same('/www/about', $url->path);
+	Assert::same('/www/', $url->scriptPath);
+	Assert::same('about', $url->relativePath);
+	Assert::same('about', $url->pathInfo);
+});
+
+
+test(function () {
+	$url = new UrlScript('http://nette.org:8080/www/index.php', '/www/index.php');
+	Assert::same('/www/index.php', $url->path);
+	Assert::same('/www/index.php', $url->scriptPath);
+	Assert::same('index.php', $url->relativePath);
+	Assert::same('', $url->pathInfo);
+});