Skip to content

Commit cb5f698

Browse files
committed
fix: index.php and spark do not work
1 parent f5dd4dd commit cb5f698

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

public/index.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,16 @@
5252
require_once $paths->systemDirectory . '/Config/DotEnv.php';
5353
(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load();
5454

55+
// DEFINE ENVIRONMENT
56+
if (! defined('ENVIRONMENT')) {
57+
$env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT');
58+
define('ENVIRONMENT', ($env !== false) ? $env : 'production');
59+
unset($env);
60+
}
61+
5562
// LOAD ENVIRONMENT BOOTSTRAP
56-
if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) {
57-
require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
63+
if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) {
64+
require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php';
5865
} else {
5966
header('HTTP/1.1 503 Service Unavailable.', true, 503);
6067
echo 'The application environment is not set correctly.';

spark

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,16 @@ $paths = new Config\Paths();
8080
require_once $paths->systemDirectory . '/Config/DotEnv.php';
8181
(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load();
8282

83+
// DEFINE ENVIRONMENT
84+
if (! defined('ENVIRONMENT')) {
85+
$env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT');
86+
define('ENVIRONMENT', ($env !== false) ? $env : 'production');
87+
unset($env);
88+
}
89+
8390
// LOAD ENVIRONMENT BOOTSTRAP
84-
if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) {
85-
require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
91+
if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) {
92+
require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php';
8693
} else {
8794
header('HTTP/1.1 503 Service Unavailable.', true, 503);
8895
echo 'The application environment is not set correctly.';

system/bootstrap.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,6 @@
1717
use Config\Paths;
1818
use Config\Services;
1919

20-
/*
21-
* ---------------------------------------------------------------
22-
* DEFINE ENVIRONMENT
23-
* ---------------------------------------------------------------
24-
*/
25-
26-
if (! defined('ENVIRONMENT')) {
27-
$env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT');
28-
define('ENVIRONMENT', ($env !== false) ? $env : 'production');
29-
unset($env);
30-
}
31-
3220
/*
3321
* ---------------------------------------------------------------
3422
* SETUP OUR PATH CONSTANTS

0 commit comments

Comments
 (0)