address review suggestions

Author: paulbalandan

system/CLI/CLI.php

@@ -656,7 +656,7 @@ public static function strlen(?string $string): int
      */
     public static function streamSupports(string $function, $resource): bool
     {
-        if (service('environmentdetector')->isTesting()) {
+        if (service('envdetector')->isTesting()) {
             // In the current setup of the tests we cannot fully check
             // if the stream supports the function since we are using
             // filtered streams.

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 && ! service('environmentdetector')->isTesting()) {
+        if ($this->readlineSupport && ! service('envdetector')->isTesting()) {
             return readline($prefix); // @codeCoverageIgnore
         }
 

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 = service('environmentdetector')->isTesting() ? 'tests' : $config->defaultGroup;
+            $group = service('envdetector')->isTesting() ? 'tests' : $config->defaultGroup;
 
             $config->{$group}['database'] = '';
 

system/Commands/Database/MigrateRefresh.php

@@ -74,7 +74,7 @@ public function run(array $params)
     {
         $params['b'] = 0;
 
-        if (service('environmentdetector')->isProduction()) {
+        if (service('envdetector')->isProduction()) {
             // @codeCoverageIgnoreStart
             $force = array_key_exists('f', $params) || CLI::getOption('f');
 

system/Commands/Database/MigrateRollback.php

@@ -72,7 +72,7 @@ class MigrateRollback extends BaseCommand
      */
     public function run(array $params)
     {
-        if (service('environmentdetector')->isProduction()) {
+        if (service('envdetector')->isProduction()) {
             // @codeCoverageIgnoreStart
             $force = array_key_exists('f', $params) || CLI::getOption('f');
 

system/Commands/Database/MigrateStatus.php

@@ -92,7 +92,7 @@ public function run(array $params)
         $status = [];
 
         foreach (array_keys($namespaces) as $namespace) {
-            if (! service('environmentdetector')->isTesting()) {
+            if (! service('envdetector')->isTesting()) {
                 // Make Tests\\Support discoverable for testing
                 $this->ignoredNamespaces[] = 'Tests\Support'; // @codeCoverageIgnore
             }

system/Commands/Translation/LocalizationFinder.php

@@ -61,7 +61,7 @@ public function run(array $params)
         $currentDir         = APPPATH;
         $this->languagePath = $currentDir . 'Language';
 
-        if (service('environmentdetector')->isTesting()) {
+        if (service('envdetector')->isTesting()) {
             $currentDir         = SUPPORTPATH . 'Services' . DIRECTORY_SEPARATOR;
             $this->languagePath = SUPPORTPATH . 'Language';
         }

system/Commands/Translation/LocalizationSync.php

@@ -85,7 +85,7 @@ public function run(array $params)
             return EXIT_USER_INPUT;
         }
 
-        if (service('environmentdetector')->isTesting()) {
+        if (service('envdetector')->isTesting()) {
             $this->languagePath = SUPPORTPATH . 'Language';
         }
 

system/Config/BaseService.php

@@ -29,6 +29,7 @@
 use CodeIgniter\Debug\Toolbar;
 use CodeIgniter\Email\Email;
 use CodeIgniter\Encryption\EncrypterInterface;
+use CodeIgniter\EnvironmentDetector;
 use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Filters\Filters;
 use CodeIgniter\Format\Format;
@@ -111,6 +112,7 @@
  * @method static CURLRequest                curlrequest($options = [], ResponseInterface $response = null, App $config = null, $getShared = true)
  * @method static Email                      email($config = null, $getShared = true)
  * @method static EncrypterInterface         encrypter(Encryption $config = null, $getShared = false)
+ * @method static EnvironmentDetector        envdetector(?string $environment = null, bool $getShared = true)
  * @method static Exceptions                 exceptions(ConfigExceptions $config = null, $getShared = true)
  * @method static Filters                    filters(ConfigFilters $config = null, $getShared = true)
  * @method static Format                     format(ConfigFormat $config = null, $getShared = true)

system/Config/Services.php

@@ -264,12 +264,14 @@ public static function encrypter(?EncryptionConfig $config = null, $getShared =
      * Provides a simple way to determine the current environment
      * of the application.
      *
-     * @return EnvironmentDetector
+     * Primarily intended for testing environment-specific branches by
+     * mocking this service. Mocking it does not modify the `ENVIRONMENT`
+     * constant. It only affects code paths that resolve and use this service.
      */
-    public static function environmentdetector(?string $environment = null, bool $getShared = true)
+    public static function envdetector(?string $environment = null, bool $getShared = true): EnvironmentDetector
     {
         if ($getShared) {
-            return static::getSharedInstance('environmentdetector', $environment);
+            return static::getSharedInstance('envdetector', $environment);
         }
 
         return new EnvironmentDetector($environment);