fix: is_cli() returns true when $_SERVER['HTTP_USER_AGENT'] is missing

Fixes codeigniter4#5336
kenjis · Nov 26, 2021 · 3d2a936 · 3d2a936
1 parent 0a55082
commit 3d2a936
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/system/Common.php b/system/Common.php
@@ -643,16 +643,7 @@ function helper($filenames)
      */
     function is_cli(): bool
     {
-        if (defined('STDIN')) {
-            return true;
-        }
-
-        if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0) {
-            return true;
-        }
-
-        // if source of request is from CLI, the `$_SERVER` array will not populate this key
-        return ! isset($_SERVER['REQUEST_METHOD']);
+        return in_array(PHP_SAPI, ['cli', 'phpdbg'], true);
     }
 }