From aba6382f2e28b38f95754974b2dbe0bb45e06897 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 30 Jun 2022 12:56:31 +0300 Subject: [PATCH] Added variables `$environment` (string), `$request` (PSR-7 ServerRequestInterface|null) and `$uri` (PSR-7 Uri|null) to be used in `setup.php` --- CHANGELOG.md | 1 + system/src/Grav/Common/Config/Setup.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e60344f0d..378842725 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 1. [](#new) * Added support for `multipart/form-data` content type in PUT and PATCH requests * Added support for object relationships + * Added variables `$environment` (string), `$request` (PSR-7 ServerRequestInterface|null) and `$uri` (PSR-7 Uri|null) to be used in `setup.php` # v1.7.34 ## 06/14/2022 diff --git a/system/src/Grav/Common/Config/Setup.php b/system/src/Grav/Common/Config/Setup.php index f8ce94394..b8c121a1c 100644 --- a/system/src/Grav/Common/Config/Setup.php +++ b/system/src/Grav/Common/Config/Setup.php @@ -182,13 +182,14 @@ class Setup extends Data // If no environment is set, make sure we get one (CLI or hostname). if (null === $environment) { if (defined('GRAV_CLI')) { + $request = null; + $uri = null; $environment = 'cli'; } else { /** @var ServerRequestInterface $request */ $request = $container['request']; - $host = $request->getUri()->getHost(); - - $environment = Utils::substrToString($host, ':'); + $uri = $request->getUri(); + $environment = $uri->getHost(); } }