geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-13 01:03:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added better handling of domains on urls.

Browse Source
This commit is contained in:
Simon
2023-11-27 06:53:33 +01:00
parent ed1ed43484
commit d17ee96221
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Pecee/Http/Request.php
View File

@@ -395,10 +395,6 @@ class Request
{
$this->url = $url;
if ($this->url->getHost() === null && $this->getHost() !== null) {
$this->url->setHost((string)$this->getHost());
}
if ($this->isSecure() === true) {
$this->url->setScheme('https');
}

11
src/Pecee/Http/Url.php
View File

@@ -144,10 +144,15 @@ class Url implements JsonSerializable
/**
* Get url host
*
* @param bool $includeTrails Prepend // in front of hostname
* @return string|null
*/
public function getHost(): ?string
public function getHost(bool $includeTrails = false): ?string
{
if ((string)$this->host !== '' && $includeTrails === true) {
return '//' . $this->host;
}
return $this->host;
}
@@ -530,12 +535,12 @@ class Url implements JsonSerializable
*/
public function jsonSerialize(): string
{
return $this->getRelativeUrl();
return $this->getHost(true) . $this->getRelativeUrl();
}
public function __toString(): string
{
return $this->getRelativeUrl();
return $this->getHost(true) . $this->getRelativeUrl();
}
}