fix env
This commit is contained in:
+13
-1
@@ -167,12 +167,24 @@ class Boot
|
|||||||
/**
|
/**
|
||||||
* Load environment settings from .env files into $_SERVER and $_ENV
|
* Load environment settings from .env files into $_SERVER and $_ENV
|
||||||
*/
|
*/
|
||||||
protected static function loadDotEnv(Paths $paths): void
|
protected static function loadDotEnvRetired(Paths $paths): void
|
||||||
{
|
{
|
||||||
require_once $paths->systemDirectory . '/Config/DotEnv.php';
|
require_once $paths->systemDirectory . '/Config/DotEnv.php';
|
||||||
(new DotEnv($paths->appDirectory . '/../'))->load();
|
(new DotEnv($paths->appDirectory . '/../'))->load();
|
||||||
}
|
}
|
||||||
|
protected static function loadDotEnv(Paths $paths): void
|
||||||
|
{
|
||||||
|
require_once $paths->systemDirectory . '/Config/DotEnv.php';
|
||||||
|
$env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT']
|
||||||
|
?? getenv('CI_ENVIRONMENT')
|
||||||
|
?: 'production';
|
||||||
|
|
||||||
|
$env_file = '.env'; // default file
|
||||||
|
if ($env == 'production'){{
|
||||||
|
$env_file = '.env.live';
|
||||||
|
}}
|
||||||
|
(new DotEnv($paths->appDirectory . '/../', $env_file))->load();
|
||||||
|
}
|
||||||
protected static function defineEnvironment(): void
|
protected static function defineEnvironment(): void
|
||||||
{
|
{
|
||||||
if (! defined('ENVIRONMENT')) {
|
if (! defined('ENVIRONMENT')) {
|
||||||
|
|||||||
Reference in New Issue
Block a user