File tree Expand file tree Collapse file tree 3 files changed +18
-16
lines changed Expand file tree Collapse file tree 3 files changed +18
-16
lines changed Original file line number Diff line number Diff line change 52
52
require_once $ paths ->systemDirectory . '/Config/DotEnv.php ' ;
53
53
(new CodeIgniter \Config \DotEnv ($ paths ->appDirectory . '/../ ' ))->load ();
54
54
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
+
55
62
// 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 ' ;
58
65
} else {
59
66
header ('HTTP/1.1 503 Service Unavailable. ' , true , 503 );
60
67
echo 'The application environment is not set correctly. ' ;
Original file line number Diff line number Diff line change @@ -80,9 +80,16 @@ $paths = new Config\Paths();
80
80
require_once $ paths ->systemDirectory . '/Config/DotEnv.php ' ;
81
81
(new CodeIgniter \Config \DotEnv ($ paths ->appDirectory . '/../ ' ))->load ();
82
82
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
+
83
90
// 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 ' ;
86
93
} else {
87
94
header ('HTTP/1.1 503 Service Unavailable. ' , true , 503 );
88
95
echo 'The application environment is not set correctly. ' ;
Original file line number Diff line number Diff line change 17
17
use Config \Paths ;
18
18
use Config \Services ;
19
19
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
-
32
20
/*
33
21
* ---------------------------------------------------------------
34
22
* SETUP OUR PATH CONSTANTS
You can’t perform that action at this time.
0 commit comments