Merge branch 'master' into update-cli-output

This commit is contained in:
Marcel Pociot committed 2022-02-23 17:39:03 +01:00
commit 83f49d49c2
7 files changed
+13 -13

No files matched your search

+6 -6
View File
@@ -6,7 +6,7 @@ class Configuration
{
/** @var string */
protected $host;
/** @var string */
protected $serverHost;
@@ -35,6 +35,11 @@ class Configuration
return $this->serverHost;
}
public function setServerHost($serverHost)
{
$this->serverHost = $serverHost;
}
public function auth(): ?string
{
return $this->auth;
@@ -45,11 +50,6 @@ class Configuration
return intval($this->port);
}
public function setServerHost($host)
{
$this->serverHost = $host;
}
public function getUrl(string $subdomain): string
{
$httpProtocol = $this->port() === 443 ? 'https' : 'http';
+1 -1
View File
@@ -310,7 +310,7 @@ class Factory
protected function registerStatisticsCollector()
{
if (config('expose.admin.statistics.enable_statistics', true) === false) {
return;
return $this;
}
app()->singleton(StatisticsRepository::class, function () {