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

Reduce redundant assignments

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-10-30 17:29:31 +01:00
parent 4f5da9b3db
commit 0deb040847
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Message/Http/Request.php
View File

@ -212,6 +212,7 @@ class Request extends RequestAbstract
UriFactory::setQuery(':user', $this->uri->getUser());
UriFactory::setQuery(':pass', $this->uri->getPass());
// todo: flush previous
foreach($this->data as $key => $value) {
UriFactory::setQuery('?' . $key, $value);
}

25
Uri/Http.php
View File

@ -150,27 +150,26 @@ class Http implements UriInterface
$this->uri = $uri;
$url = parse_url($this->uri);
$this->scheme = $url['scheme'] ?? '';
$this->host = $url['host'] ?? null;
$this->port = $url['port'] ?? null;
$this->user = $url['user'] ?? null;
$this->pass = $url['pass'] ?? null;
$this->path = $url['path'] ?? null;
$this->scheme = $url['scheme'] ?? '';
$this->host = $url['host'] ?? null;
$this->port = $url['port'] ?? null;
$this->user = $url['user'] ?? null;
$this->pass = $url['pass'] ?? null;
$this->path = $url['path'] ?? null;
if(StringUtils::endsWith($this->path, '.php')) {
if (StringUtils::endsWith($this->path, '.php')) {
$this->path = substr($this->path, 0, -4);
}
$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->query = $url['query'] ?? null;
$this->queryString = $this->query;
$this->queryString = $url['query'] ?? null;
if (isset($this->query)) {
parse_str($this->query, $this->query);
if (isset($this->queryString)) {
parse_str($this->queryString, $this->query);
}
$this->fragment = $url['fragment'] ?? null;
$this->base = $this->scheme . '://' . $this->host . $this->rootPath;
$this->base = $this->scheme . '://' . $this->host . $this->rootPath;
}
/**
@ -275,7 +274,7 @@ class Http implements UriInterface
*/
public function getPathElement(int $pos) : string
{
return explode('/', $this->path)[$pos];
return explode('/', $this->path)[$pos];
}
/**