Merge pull request #28869 from ThibaudDauce/console-environment-separ…

…ated-with-space [5.8] Allow console environment argument to be separated with a space
laravel · Jun 17, 2019 · 85137e0 · 85137e0
2 parents 0ab884f + ac0c9b2
commit 85137e0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/Illuminate/Foundation/EnvironmentDetector.php b/src/Illuminate/Foundation/EnvironmentDetector.php
@@ -3,7 +3,6 @@
 namespace Illuminate\Foundation;
 
 use Closure;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class EnvironmentDetector
@@ -48,7 +47,7 @@ protected function detectConsoleEnvironment(Closure $callback, array $args)
         // and if it was that automatically overrides as the environment. Otherwise, we
         // will check the environment as a "web" request like a typical HTTP request.
         if (! is_null($value = $this->getEnvironmentArgument($args))) {
-            return head(array_slice(explode('=', $value), 1));
+            return $value;
         }
 
         return $this->detectWebEnvironment($callback);
@@ -62,8 +61,14 @@ protected function detectConsoleEnvironment(Closure $callback, array $args)
      */
     protected function getEnvironmentArgument(array $args)
     {
-        return Arr::first($args, function ($value) {
-            return Str::startsWith($value, '--env');
-        });
+        foreach ($args as $i => $value) {
+            if ($value === '--env') {
+                return $args[$i + 1] ?? null;
+            }
+
+            if (Str::startsWith($value, '--env')) {
+                return head(array_slice(explode('=', $value), 1));
+            }
+        }
     }
 }
diff --git a/tests/Foundation/FoundationEnvironmentDetectorTest.php b/tests/Foundation/FoundationEnvironmentDetectorTest.php
@@ -32,4 +32,24 @@ public function testConsoleEnvironmentDetection()
         }, ['--env=local']);
         $this->assertEquals('local', $result);
     }
+
+    public function testConsoleEnvironmentDetectionSeparatedWithSpace()
+    {
+        $env = new EnvironmentDetector;
+
+        $result = $env->detect(function () {
+            return 'foobar';
+        }, ['--env', 'local']);
+        $this->assertEquals('local', $result);
+    }
+
+    public function testConsoleEnvironmentDetectionWithNoValue()
+    {
+        $env = new EnvironmentDetector;
+
+        $result = $env->detect(function () {
+            return 'foobar';
+        }, ['--env']);
+        $this->assertEquals('foobar', $result);
+    }
 }