swap manual checks on ENVIRONMENT

paulbalandan · paulbalandan · commit 1ea843faece9 · 2026-04-23T17:13:16.000+08:00
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -656,7 +656,7 @@ public static function strlen(?string $string): int
      */
     public static function streamSupports(string $function, $resource): bool
     {
-        if (ENVIRONMENT === 'testing') {
+        if (service('environmentdetector')->isTesting()) {
             // In the current setup of the tests we cannot fully check
             // if the stream supports the function since we are using
             // filtered streams.
diff --git a/system/CLI/InputOutput.php b/system/CLI/InputOutput.php
@@ -42,7 +42,7 @@ public function __construct()
     public function input(?string $prefix = null): string
     {
         // readline() can't be tested.
-        if ($this->readlineSupport && ENVIRONMENT !== 'testing') {
+        if ($this->readlineSupport && ! service('environmentdetector')->isTesting()) {
             return readline($prefix); // @codeCoverageIgnore
         }
 
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
@@ -87,7 +87,7 @@ public function run(array $params)
             $config = config(Database::class);
 
             // Set to an empty database to prevent connection errors.
-            $group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
+            $group = service('environmentdetector')->isTesting() ? 'tests' : $config->defaultGroup;
 
             $config->{$group}['database'] = '';
 
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
@@ -74,7 +74,7 @@ public function run(array $params)
     {
         $params['b'] = 0;
 
-        if (ENVIRONMENT === 'production') {
+        if (service('environmentdetector')->isProduction()) {
             // @codeCoverageIgnoreStart
             $force = array_key_exists('f', $params) || CLI::getOption('f');
 
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
@@ -72,7 +72,7 @@ class MigrateRollback extends BaseCommand
      */
     public function run(array $params)
     {
-        if (ENVIRONMENT === 'production') {
+        if (service('environmentdetector')->isProduction()) {
             // @codeCoverageIgnoreStart
             $force = array_key_exists('f', $params) || CLI::getOption('f');
 
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
@@ -92,7 +92,7 @@ public function run(array $params)
         $status = [];
 
         foreach (array_keys($namespaces) as $namespace) {
-            if (ENVIRONMENT !== 'testing') {
+            if (! service('environmentdetector')->isTesting()) {
                 // Make Tests\\Support discoverable for testing
                 $this->ignoredNamespaces[] = 'Tests\Support'; // @codeCoverageIgnore
             }
diff --git a/system/Commands/Translation/LocalizationFinder.php b/system/Commands/Translation/LocalizationFinder.php
@@ -61,7 +61,7 @@ public function run(array $params)
         $currentDir         = APPPATH;
         $this->languagePath = $currentDir . 'Language';
 
-        if (ENVIRONMENT === 'testing') {
+        if (service('environmentdetector')->isTesting()) {
             $currentDir         = SUPPORTPATH . 'Services' . DIRECTORY_SEPARATOR;
             $this->languagePath = SUPPORTPATH . 'Language';
         }
diff --git a/system/Commands/Translation/LocalizationSync.php b/system/Commands/Translation/LocalizationSync.php
@@ -85,7 +85,7 @@ public function run(array $params)
             return EXIT_USER_INPUT;
         }
 
-        if (ENVIRONMENT === 'testing') {
+        if (service('environmentdetector')->isTesting()) {
             $this->languagePath = SUPPORTPATH . 'Language';
         }
 
diff --git a/system/Database/Config.php b/system/Database/Config.php
@@ -61,7 +61,7 @@ public static function connect($group = null, bool $getShared = true)
             $dbConfig = config(DbConfig::class);
 
             if ($group === null) {
-                $group = (ENVIRONMENT === 'testing') ? 'tests' : $dbConfig->defaultGroup;
+                $group = service('environmentdetector')->isTesting() ? 'tests' : $dbConfig->defaultGroup;
             }
 
             assert(is_string($group));
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -448,7 +448,7 @@ public function findMigrations(): array
         $migrations = [];
 
         foreach ($namespaces as $namespace) {
-            if (ENVIRONMENT !== 'testing' && $namespace === 'Tests\Support') {
+            if (! service('environmentdetector')->isTesting() && $namespace === 'Tests\Support') {
                 continue;
             }
 
@@ -985,7 +985,7 @@ protected function migrate($direction, $migration): bool
         $instance = new $class(Database::forge($this->db));
         $group    = $instance->getDBGroup() ?? $this->group;
 
-        if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
+        if (! service('environmentdetector')->isTesting() && $group === 'tests' && $this->groupFilter !== 'tests') {
             // @codeCoverageIgnoreStart
             $this->groupSkip = true;
 
diff --git a/system/Debug/ExceptionHandler.php b/system/Debug/ExceptionHandler.php
@@ -94,7 +94,7 @@ public function handle(
 
                 $this->respond($data, $statusCode)->send();
 
-                if (ENVIRONMENT !== 'testing') {
+                if (! service('environmentdetector')->isTesting()) {
                     exit($exitCode); // @codeCoverageIgnore
                 }
 
@@ -123,7 +123,7 @@ public function handle(
         // Displays the HTML or CLI error code.
         $this->render($exception, $statusCode, $viewFile);
 
-        if (ENVIRONMENT !== 'testing') {
+        if (! service('environmentdetector')->isTesting()) {
             exit($exitCode); // @codeCoverageIgnore
         }
     }
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -457,7 +457,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
      */
     public function respond(): void
     {
-        if (ENVIRONMENT === 'testing') {
+        if (service('environmentdetector')->isTesting()) {
             return;
         }
 
diff --git a/system/Debug/Toolbar/Collectors/Config.php b/system/Debug/Toolbar/Collectors/Config.php
@@ -32,7 +32,7 @@ public static function display(): array
             'ciVersion'   => CodeIgniter::CI_VERSION,
             'phpVersion'  => PHP_VERSION,
             'phpSAPI'     => PHP_SAPI,
-            'environment' => ENVIRONMENT,
+            'environment' => service('environmentdetector')->get(),
             'baseURL'     => $config->baseURL,
             'timezone'    => app_timezone(),
             'locale'      => service('request')->getLocale(),
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
@@ -37,7 +37,7 @@ public function format($data)
         $options = $config->formatterOptions['application/json'] ?? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
         $options |= JSON_PARTIAL_OUTPUT_ON_ERROR;
 
-        if (ENVIRONMENT !== 'production') {
+        if (! service('environmentdetector')->isProduction()) {
             $options |= JSON_PRETTY_PRINT;
         }
 
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
@@ -247,7 +247,7 @@ public function noCache(): self
     public function send()
     {
         // Turn off output buffering completely, even if php.ini output_buffering is not off
-        if (ENVIRONMENT !== 'testing') {
+        if (! service('environmentdetector')->isTesting()) {
             while (ob_get_level() > 0) {
                 ob_end_clean();
             }
diff --git a/system/HTTP/SSEResponse.php b/system/HTTP/SSEResponse.php
@@ -137,7 +137,7 @@ private function write(string $output): bool
     {
         echo $output;
 
-        if (ENVIRONMENT !== 'testing') {
+        if (! service('environmentdetector')->isTesting()) {
             if (ob_get_level() > 0) {
                 ob_flush();
             }
@@ -156,7 +156,7 @@ private function write(string $output): bool
     public function send()
     {
         // Turn off output buffering completely, even if php.ini output_buffering is not off
-        if (ENVIRONMENT !== 'testing') {
+        if (! service('environmentdetector')->isTesting()) {
             set_time_limit(0);
             ini_set('zlib.output_compression', 'Off');
 
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
@@ -703,7 +703,7 @@ function validation_errors()
 
         // Check the session to see if any were
         // passed along from a redirect withErrors() request.
-        if ($errors !== null && (ENVIRONMENT === 'testing' || ! is_cli())) {
+        if ($errors !== null && (service('environmentdetector')->isTesting() || ! is_cli())) {
             return $errors;
         }
 
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
@@ -401,7 +401,7 @@ protected function interpolate($message, array $context = [])
 
         $replace['{post_vars}'] = '$_POST: ' . print_r(service('superglobals')->getPostArray(), true);
         $replace['{get_vars}']  = '$_GET: ' . print_r(service('superglobals')->getGetArray(), true);
-        $replace['{env}']       = ENVIRONMENT;
+        $replace['{env}']       = service('environmentdetector')->get();
 
         // Allow us to log the file/line that we are logging from
         if (str_contains($message, '{file}') || str_contains($message, '{line}')) {
diff --git a/system/Router/Attributes/Restrict.php b/system/Router/Attributes/Restrict.php
@@ -69,7 +69,7 @@ protected function checkEnvironment(): void
             return;
         }
 
-        $currentEnv = ENVIRONMENT;
+        $currentEnv = service('environmentdetector')->get();
         $allowed    = [];
         $denied     = [];
 
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -1163,7 +1163,7 @@ public function view(string $from, string $view, ?array $options = null): RouteC
      */
     public function environment(string $env, Closure $callback): RouteCollectionInterface
     {
-        if ($env === ENVIRONMENT) {
+        if (service('environmentdetector')->is($env)) {
             $callback($this);
         }
 
diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -86,7 +86,7 @@ public function __construct(SessionHandlerInterface $driver, SessionConfig $conf
      */
     public function start()
     {
-        if (is_cli() && ENVIRONMENT !== 'testing') {
+        if (is_cli() && ! service('environmentdetector')->isTesting()) {
             // @codeCoverageIgnoreStart
             $this->logger->debug('Session: Initialization under CLI aborted.');
 
@@ -273,7 +273,7 @@ private function removeOldSessionCookie(): void
 
     public function destroy()
     {
-        if (ENVIRONMENT === 'testing') {
+        if (service('environmentdetector')->isTesting()) {
             return;
         }
 
@@ -287,7 +287,7 @@ public function destroy()
      */
     public function close()
     {
-        if (ENVIRONMENT === 'testing') {
+        if (service('environmentdetector')->isTesting()) {
             return;
         }
 
@@ -616,7 +616,7 @@ protected function setSaveHandler()
      */
     protected function startSession()
     {
-        if (ENVIRONMENT === 'testing') {
+        if (service('environmentdetector')->isTesting()) {
             $_SESSION = [];
 
             return;
diff --git a/system/Validation/StrictRules/FileRules.php b/system/Validation/StrictRules/FileRules.php
@@ -62,17 +62,14 @@ public function uploaded(?string $blank, string $name): bool
                 return false;
             }
 
-            if (ENVIRONMENT === 'testing') {
-                if ($file->getError() !== 0) {
-                    return false;
-                }
-            } else {
-                // Note: cannot unit test this; no way to over-ride ENVIRONMENT?
-                // @codeCoverageIgnoreStart
-                if (! $file->isValid()) {
-                    return false;
-                }
-                // @codeCoverageIgnoreEnd
+            // In the testing env is_uploaded_file() always returns false
+            // (fixtures aren't real HTTP uploads), so check the error code directly.
+            $isValid = service('environmentdetector')->isTesting()
+                ? $file->getError() === UPLOAD_ERR_OK
+                : $file->isValid();
+
+            if (! $isValid) {
+                return false;
             }
         }
 
diff --git a/tests/system/EnvironmentDetectorTest.php b/tests/system/EnvironmentDetectorTest.php
@@ -126,5 +126,6 @@ public function testResolvesAsSharedService(): void
 
         $this->assertInstanceOf(EnvironmentDetector::class, $first);
         $this->assertSame($first, $second);
+        $this->assertSame(ENVIRONMENT, $first->get());
     }
 }
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
@@ -13,6 +13,8 @@
 
 namespace CodeIgniter\Format;
 
+use CodeIgniter\Config\Services;
+use CodeIgniter\EnvironmentDetector;
 use CodeIgniter\Format\Exceptions\FormatException;
 use CodeIgniter\Test\CIUnitTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -32,6 +34,12 @@ protected function setUp(): void
         $this->jsonFormatter = new JSONFormatter();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        Services::resetSingle('environmentdetector');
+    }
+
     /**
      * @param array<string, string> $data
      */
@@ -62,4 +70,11 @@ public function testJSONFormatterThrowsError(): void
 
         $this->assertSame('Boom', $this->jsonFormatter->format(["\xB1\x31"]));
     }
+
+    public function testFormattingToJsonIsCompactInProduction(): void
+    {
+        Services::injectMock('environmentdetector', new EnvironmentDetector('production'));
+
+        $this->assertSame('{"foo":"bar"}', $this->jsonFormatter->format(['foo' => 'bar']));
+    }
 }
diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php
@@ -13,6 +13,8 @@
 
 namespace CodeIgniter\Validation\StrictRules;
 
+use CodeIgniter\Config\Services;
+use CodeIgniter\EnvironmentDetector;
 use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Validation\Validation;
@@ -64,7 +66,7 @@ protected function setUp(): void
                 'name'     => 'my-avatar.png',
                 'size'     => 4614,
                 'type'     => 'image/png',
-                'error'    => 0,
+                'error'    => UPLOAD_ERR_OK,
                 'width'    => 640,
                 'height'   => 400,
             ],
@@ -153,27 +155,40 @@ protected function tearDown(): void
     {
         parent::tearDown();
         service('superglobals')->setFilesArray([]);
+        Services::resetSingle('environmentdetector');
     }
 
-    public function testUploadedTrue(): void
+    public function testUploadedPassesForSingleValidFile(): void
     {
         $this->validation->setRules(['avatar' => 'uploaded[avatar]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testUploadedFalse(): void
+    public function testUploadedFailsInProductionWhenFileWasNotHttpUpload(): void
+    {
+        // Counterpart to testUploadedPassesForSingleValidFile: the same fixture
+        // passes in the testing env but must fail in production, where isValid()
+        // enforces is_uploaded_file().
+        Services::injectMock('environmentdetector', new EnvironmentDetector('production'));
+
+        $this->validation->setRules(['avatar' => 'uploaded[avatar]']);
+
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testUploadedFailsWhenFileIsMissingFromRequest(): void
     {
         $this->validation->setRules(['avatar' => 'uploaded[userfile]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testUploadedArrayReturnsTrue(): void
+    public function testUploadedPassesWhenAllFilesInArrayAreValid(): void
     {
         $this->validation->setRules(['images' => 'uploaded[images]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testUploadedArrayReturnsFalse(): void
+    public function testUploadedFailsWhenAnyFileInArrayHasUploadError(): void
     {
         $this->validation->setRules(['photos' => 'uploaded[photos]']);
         $this->assertFalse($this->validation->run([]));

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ public static function strlen(?string $string): int`
`656`	`656`	`*/`
`657`	`657`	`public static function streamSupports(string $function, $resource): bool`
`658`	`658`	`{`
`659`		`- if (ENVIRONMENT === 'testing') {`
	`659`	`+ if (service('environmentdetector')->isTesting()) {`
`660`	`660`	`// In the current setup of the tests we cannot fully check`
`661`	`661`	`// if the stream supports the function since we are using`
`662`	`662`	`// filtered streams.`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct()`
`42`	`42`	`public function input(?string $prefix = null): string`
`43`	`43`	`{`
`44`	`44`	`// readline() can't be tested.`
`45`		`- if ($this->readlineSupport && ENVIRONMENT !== 'testing') {`
	`45`	`+ if ($this->readlineSupport && ! service('environmentdetector')->isTesting()) {`
`46`	`46`	`return readline($prefix); // @codeCoverageIgnore`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function run(array $params)`
`74`	`74`	`{`
`75`	`75`	`$params['b'] = 0;`
`76`	`76`
`77`		`- if (ENVIRONMENT === 'production') {`
	`77`	`+ if (service('environmentdetector')->isProduction()) {`
`78`	`78`	`// @codeCoverageIgnoreStart`
`79`	`79`	`$force = array_key_exists('f', $params) \|\| CLI::getOption('f');`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class MigrateRollback extends BaseCommand`
`72`	`72`	`*/`
`73`	`73`	`public function run(array $params)`
`74`	`74`	`{`
`75`		`- if (ENVIRONMENT === 'production') {`
	`75`	`+ if (service('environmentdetector')->isProduction()) {`
`76`	`76`	`// @codeCoverageIgnoreStart`
`77`	`77`	`$force = array_key_exists('f', $params) \|\| CLI::getOption('f');`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function run(array $params)`
`92`	`92`	`$status = [];`
`93`	`93`
`94`	`94`	`foreach (array_keys($namespaces) as $namespace) {`
`95`		`- if (ENVIRONMENT !== 'testing') {`
	`95`	`+ if (! service('environmentdetector')->isTesting()) {`
`96`	`96`	`// Make Tests\\Support discoverable for testing`
`97`	`97`	`$this->ignoredNamespaces[] = 'Tests\Support'; // @codeCoverageIgnore`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function run(array $params)`
`61`	`61`	`$currentDir = APPPATH;`
`62`	`62`	`$this->languagePath = $currentDir . 'Language';`
`63`	`63`
`64`		`- if (ENVIRONMENT === 'testing') {`
	`64`	`+ if (service('environmentdetector')->isTesting()) {`
`65`	`65`	`$currentDir = SUPPORTPATH . 'Services' . DIRECTORY_SEPARATOR;`
`66`	`66`	`$this->languagePath = SUPPORTPATH . 'Language';`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function run(array $params)`
`85`	`85`	`return EXIT_USER_INPUT;`
`86`	`86`	`}`
`87`	`87`
`88`		`- if (ENVIRONMENT === 'testing') {`
	`88`	`+ if (service('environmentdetector')->isTesting()) {`
`89`	`89`	`$this->languagePath = SUPPORTPATH . 'Language';`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static function connect($group = null, bool $getShared = true)`
`61`	`61`	`$dbConfig = config(DbConfig::class);`
`62`	`62`
`63`	`63`	`if ($group === null) {`
`64`		`- $group = (ENVIRONMENT === 'testing') ? 'tests' : $dbConfig->defaultGroup;`
	`64`	`+ $group = service('environmentdetector')->isTesting() ? 'tests' : $dbConfig->defaultGroup;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`assert(is_string($group));`