UrlScript: default scriptPath is whole path to maintain same behavioral as the class Url (in method getBasePath, ...) [Closes #100]

dg · dg · commit 12ac75cf816d · 2016-09-27T11:54:17.000+02:00
(possible BC break)
diff --git a/src/Http/UrlScript.php b/src/Http/UrlScript.php
@@ -27,7 +27,7 @@
 class UrlScript extends Url
 {
 	/** @var string */
-	private $scriptPath = '/';
+	private $scriptPath;
 
 
 	/**
@@ -48,7 +48,7 @@ public function setScriptPath($value)
 	 */
 	public function getScriptPath()
 	{
-		return $this->scriptPath;
+		return $this->scriptPath ?: $this->path;
 	}
 
 
@@ -58,7 +58,7 @@ public function getScriptPath()
 	 */
 	public function getBasePath()
 	{
-		$pos = strrpos($this->scriptPath, '/');
+		$pos = strrpos($this->getScriptPath(), '/');
 		return $pos === FALSE ? '' : substr($this->getPath(), 0, $pos + 1);
 	}
 
@@ -69,7 +69,7 @@ public function getBasePath()
 	 */
 	public function getPathInfo()
 	{
-		return (string) substr($this->getPath(), strlen($this->scriptPath));
+		return (string) substr($this->getPath(), strlen($this->getScriptPath()));
 	}
 
 }
diff --git a/tests/Http/UrlScript.parse.phpt b/tests/Http/UrlScript.parse.phpt
@@ -12,8 +12,8 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $url = new UrlScript('http://nette.org:8080/file.php?q=search');
-Assert::same('/', $url->scriptPath);
+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->pathInfo);
+Assert::same('',  $url->pathInfo);

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`class UrlScript extends Url`
`28`	`28`	`{`
`29`	`29`	`/** @var string */`
`30`		`- private $scriptPath = '/';`
	`30`	`+ private $scriptPath;`
`31`	`31`
`32`	`32`
`33`	`33`	`/**`
`@@ -48,7 +48,7 @@ public function setScriptPath($value)`
`48`	`48`	`*/`
`49`	`49`	`public function getScriptPath()`
`50`	`50`	`{`
`51`		`- return $this->scriptPath;`
	`51`	`+ return $this->scriptPath ?: $this->path;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`
`@@ -58,7 +58,7 @@ public function getScriptPath()`
`58`	`58`	`*/`
`59`	`59`	`public function getBasePath()`
`60`	`60`	`{`
`61`		`- $pos = strrpos($this->scriptPath, '/');`
	`61`	`+ $pos = strrpos($this->getScriptPath(), '/');`
`62`	`62`	`return $pos === FALSE ? '' : substr($this->getPath(), 0, $pos + 1);`
`63`	`63`	`}`
`64`	`64`
`@@ -69,7 +69,7 @@ public function getBasePath()`
`69`	`69`	`*/`
`70`	`70`	`public function getPathInfo()`
`71`	`71`	`{`
`72`		`- return (string) substr($this->getPath(), strlen($this->scriptPath));`
	`72`	`+ return (string) substr($this->getPath(), strlen($this->getScriptPath()));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`}`