From fab66cf3a5085383aa72f8a2dd144dc255885caf Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Mon, 7 Dec 2015 19:20:10 +0100 Subject: [PATCH] Make $container available in setup.php --- system/src/Grav/Common/Config/Setup.php | 7 ++++++- system/src/Grav/Common/Service/ConfigServiceProvider.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/system/src/Grav/Common/Config/Setup.php b/system/src/Grav/Common/Config/Setup.php index 90178d6b2..b345426c1 100644 --- a/system/src/Grav/Common/Config/Setup.php +++ b/system/src/Grav/Common/Config/Setup.php @@ -113,8 +113,13 @@ class Setup extends Data ], ]; - public function __construct($environment = 'localhost') + public function __construct($container) { + $environment = $container['uri']->environment(); + if (!$environment) { + $environment = 'localhost'; + } + // Pre-load setup.php which contains our initial configuration. // Configuration may contain dynamic parts, which is why we need to always load it. $file = GRAV_ROOT . '/setup.php'; diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php index febdcd6a7..9efbd7465 100644 --- a/system/src/Grav/Common/Service/ConfigServiceProvider.php +++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php @@ -40,7 +40,7 @@ class ConfigServiceProvider implements ServiceProviderInterface public static function setup(Container $container) { - return new Setup($container['uri']->environment()); + return new Setup($container); } public static function blueprints(Container $container)