Fix arguments passed to artisan commands that start with 'env' (#52748)

* Add failing tests * Ensure that there is an equal sign so that argument names starting with 'env' are not matched
laravel · Sep 12, 2024 · 58c2053 · 58c2053
1 parent 80cdd87
commit 58c2053
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Illuminate/Foundation/EnvironmentDetector.php b/src/Illuminate/Foundation/EnvironmentDetector.php
@@ -65,7 +65,7 @@ protected function getEnvironmentArgument(array $args)
                 return $args[$i + 1] ?? null;
             }
 
-            if (str_starts_with($value, '--env')) {
+            if (str_starts_with($value, '--env=')) {
                 return head(array_slice(explode('=', $value), 1));
             }
         }

diff --git a/tests/Foundation/FoundationEnvironmentDetectorTest.php b/tests/Foundation/FoundationEnvironmentDetectorTest.php
@@ -46,4 +46,34 @@ public function testConsoleEnvironmentDetectionWithNoValue()
         }, ['--env']);
         $this->assertSame('foobar', $result);
     }
+
+    public function testConsoleEnvironmentDetectionDoesNotUseArgumentThatStartsWithEnv()
+    {
+        $env = new EnvironmentDetector;
+
+        $result = $env->detect(function () {
+            return 'foobar';
+        }, ['--envelope=mail']);
+        $this->assertSame('foobar', $result);
+    }
+
+    public function testConsoleEnvironmentDetectionDoesNotUseArgumentThatStartsWithEnvSeparatedWithSpace()
+    {
+        $env = new EnvironmentDetector;
+
+        $result = $env->detect(function () {
+            return 'foobar';
+        }, ['--envelope', 'mail']);
+        $this->assertSame('foobar', $result);
+    }
+
+    public function testConsoleEnvironmentDetectionDoesNotUseArgumentThatStartsWithEnvWithNoValue()
+    {
+        $env = new EnvironmentDetector;
+
+        $result = $env->detect(function () {
+            return 'foobar';
+        }, ['--envelope']);
+        $this->assertSame('foobar', $result);
+    }
 }