refactor: move definition of ENVIRONMENT to index.php/spark

For Config caching.
codeigniter4 · Aug 16, 2023 · db612fa · db612fa
1 parent f9b95e3
commit db612fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/public/index.php b/public/index.php
@@ -43,6 +43,11 @@
 require_once SYSTEMPATH . 'Config/DotEnv.php';
 (new CodeIgniter\Config\DotEnv(ROOTPATH))->load();
 
+// Define ENVIRONMENT
+if (! defined('ENVIRONMENT')) {
+    define('ENVIRONMENT', env('CI_ENVIRONMENT', 'production'));
+}
+
 /*
  * ---------------------------------------------------------------
  * GRAB OUR CODEIGNITER INSTANCE

diff --git a/spark b/spark
@@ -78,6 +78,11 @@ require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstra
 require_once SYSTEMPATH . 'Config/DotEnv.php';
 (new CodeIgniter\Config\DotEnv(ROOTPATH))->load();
 
+// Define ENVIRONMENT
+if (! defined('ENVIRONMENT')) {
+    define('ENVIRONMENT', env('CI_ENVIRONMENT', 'production'));
+}
+
 // Grab our CodeIgniter
 $app = Config\Services::codeigniter();
 $app->initialize();

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -200,7 +200,6 @@ public function __construct(App $config)
     public function initialize()
     {
         // Define environment variables
-        $this->detectEnvironment();
         $this->bootstrapEnvironment();
 
         // Setup Exception Handling
@@ -560,6 +559,8 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
      *     production
      *
      * @codeCoverageIgnore
+     *
+     * @deprecated 4.4.0 No longer used. Moved to index.php and spark.
      */
     protected function detectEnvironment()
     {