Merge branch 'env-check' into 11.x

taylorotwell · taylorotwell · commit 6d537742bc35 · 2024-11-12T09:29:18.000-06:00
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -759,7 +759,9 @@ public function isProduction()
      */
     public function detectEnvironment(Closure $callback)
     {
-        $args = $_SERVER['argv'] ?? null;
+        $args = $this->runningInConsole() && $_SERVER['argv']
+            ? $_SERVER['argv']
+            : null;
 
         return $this['env'] = (new EnvironmentDetector)->detect($callback, $args);
     }

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,9 @@ public function isProduction()`
`759`	`759`	`*/`
`760`	`760`	`public function detectEnvironment(Closure $callback)`
`761`	`761`	`{`
`762`		`- $args = $_SERVER['argv'] ?? null;`
	`762`	`+ $args = $this->runningInConsole() && $_SERVER['argv']`
	`763`	`+ ? $_SERVER['argv']`
	`764`	`+ : null;`
`763`	`765`
`764`	`766`	`return $this['env'] = (new EnvironmentDetector)->detect($callback, $args);`
`765`	`767`	`}`