Merge pull request #4739 from codeigniter4/is-cli-detection

MGatner · web-flow · commit 94e09139f591 · 2021-05-25T11:15:56.000-04:00
Additional check for `$argv` variable when detecting CLI
diff --git a/system/Common.php b/system/Common.php
@@ -763,7 +763,7 @@ function is_cli(): bool
 			return true;
 		}
 
-		if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']))
+		if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0)
 		{
 			return true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ function is_cli(): bool`
`763`	`763`	`return true;`
`764`	`764`	`}`
`765`	`765`
`766`		`- if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']))`
	`766`	`+ if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0)`
`767`	`767`	`{`
`768`	`768`	`return true;`
`769`	`769`	`}`