Merge pull request #4725 from paulbalandan/is-cli

Expand CLI detection

Author: paulbalandan

system/Common.php

@@ -740,15 +740,36 @@ function helper($filenames)
 if (! function_exists('is_cli'))
 {
 	/**
-	 * Is CLI?
-	 *
-	 * Test to see if a request was made from the command line.
+	 * Check if PHP was invoked from the command line.
 	 *
 	 * @return boolean
+	 *
+	 * @codeCoverageIgnore Cannot be tested fully as PHPUnit always run in CLI
 	 */
 	function is_cli(): bool
 	{
-		return (PHP_SAPI === 'cli' || defined('STDIN'));
+		if (PHP_SAPI === 'cli')
+		{
+			return true;
+		}
+
+		if (defined('STDIN'))
+		{
+			return true;
+		}
+
+		if (stristr(PHP_SAPI, 'cgi') && getenv('TERM'))
+		{
+			return true;
+		}
+
+		if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']))
+		{
+			return true;
+		}
+
+		// if source of request is from CLI, the `$_SERVER` array will not populate this key
+		return ! isset($_SERVER['REQUEST_METHOD']);
 	}
 }
 
@@ -1278,14 +1299,16 @@ function view_cell(string $library, $params = null, int $ttl = 0, string $cacheN
  *
  * @see https://github.com/laravel/framework/blob/8.x/src/Illuminate/Support/helpers.php
  */
-// @codeCoverageIgnoreStart
 if (! function_exists('class_basename'))
 {
 	/**
 	 * Get the class "basename" of the given object / class.
 	 *
-	 * @param  string|object $class
+	 * @param string|object $class
+	 *
 	 * @return string
+	 *
+	 * @codeCoverageIgnore
 	 */
 	function class_basename($class)
 	{
@@ -1300,8 +1323,11 @@ function class_basename($class)
 	/**
 	 * Returns all traits used by a class, its parent classes and trait of their traits.
 	 *
-	 * @param  object|string $class
+	 * @param object|string $class
+	 *
 	 * @return array
+	 *
+	 * @codeCoverageIgnore
 	 */
 	function class_uses_recursive($class)
 	{
@@ -1327,8 +1353,11 @@ function class_uses_recursive($class)
 	/**
 	 * Returns all traits used by a trait and its traits.
 	 *
-	 * @param  string $trait
+	 * @param string $trait
+	 *
 	 * @return array
+	 *
+	 * @codeCoverageIgnore
 	 */
 	function trait_uses_recursive($trait)
 	{
@@ -1342,4 +1371,3 @@ function trait_uses_recursive($trait)
 		return $traits;
 	}
 }
-// @codeCoverageIgnoreEnd

tests/system/CommonFunctionsTest.php

@@ -507,4 +507,10 @@ public function testHelperLoadsOnce()
 		$this->assertFalse($exception);
 		Services::reset();
 	}
+
+	public function testIsCli()
+	{
+		$this->assertIsBool(is_cli());
+		$this->assertTrue(is_cli());
+	}
 }