Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-23 14:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing more default values

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-01-25 16:46:17 +01:00
parent fb9a78f12e
commit 6a5e5d5143
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Uri/Http.php
View File

@ -166,7 +166,7 @@ class Http implements UriInterface
$this->path = strpos($this->path, $this->rootPath) === 0 ? substr($this->path, strlen($this->rootPath), strlen($this->path)) : $this->path; // TODO: this could cause a bug if the rootpath is the same as a regular path which is usually the language
$this->queryString = $url['query'] ?? '';
if (isset($this->queryString)) {
if (!empty($this->queryString)) {
parse_str($this->queryString, $this->query);
}
@ -260,7 +260,7 @@ class Http implements UriInterface
*/
public function getPath() : string
{
return $this->path ?? '';
return $this->path;
}
/**
@ -269,7 +269,7 @@ class Http implements UriInterface
public function getRoute() : string
{
$query = $this->getQuery();
return ($this->path ?? '') . (!empty($query) ? '?' . $this->getQuery() : '');
return $this->path . (!empty($query) ? '?' . $this->getQuery() : '');
}
/**
@ -285,7 +285,7 @@ class Http implements UriInterface
*/
public function getQuery(string $key = null) /* : ?string */
{
return isset($key) ? $this->query[$key] ?? null : $this->queryString ?? '';
return isset($key) ? $this->query[$key] ?? null : $this->queryString;
}
/**