Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Dec 9, 2024 · bdde1b2 · bdde1b2
2 parents 5c14acc + 4d09a3f
commit bdde1b2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -121,14 +121,15 @@ protected function copyTestbenchDotEnvFile(Filesystem $filesystem, string $worki
             return;
         }
 
-        /** @var string $targetEnvironmentFile */
-        $targetEnvironmentFile = select(
-            label: "Export '.env' file as?",
-            options: $choices->prepend('Skip exporting .env'), // @phpstan-ignore argument.type
-            default: 'Skip exporting .env'
-        );
-
-        if ($targetEnvironmentFile === 'Skip exporting .env') {
+        /** @var string|null $targetEnvironmentFile */
+        $targetEnvironmentFile = $this->input->isInteractive()
+            ? select(
+                label: "Export '.env' file as?",
+                options: $choices->prepend('Skip exporting .env'), // @phpstan-ignore argument.type
+                default: 'Skip exporting .env'
+            ) : null;
+
+        if (\in_array($targetEnvironmentFile, [null, 'Skip exporting .env'])) {
             return;
         }
 

diff --git a/tests/Console/DevToolCommandTest.php b/tests/Console/DevToolCommandTest.php
@@ -50,4 +50,14 @@ public function it_can_run_devtool_command_without_installation()
         $this->assertCommandExecutedWithDevTool();
         $this->assertCommandExecutedWithoutInstall();
     }
+
+    #[Test]
+    public function it_can_be_installed_with_no_interaction_options()
+    {
+        $this->artisan('workbench:devtool', ['--no-install' => true, '--no-interaction' => true])
+            ->assertSuccessful();
+
+        $this->assertCommandExecutedWithDevTool();
+        $this->assertCommandExecutedWithoutInstall();
+    }
 }
diff --git a/tests/Console/InstallCommandTest.php b/tests/Console/InstallCommandTest.php
@@ -86,4 +86,14 @@ public function it_can_ignore_generating_environment_file_if_it_already_exists()
         $this->assertCommandExecutedWithBasicInstall();
         $this->assertCommandExecutedWithoutDevTool();
     }
+
+    #[Test]
+    public function it_can_be_installed_with_no_interaction_options()
+    {
+        $this->artisan('workbench:install', ['--basic' => true, '--no-devtool' => true, '--no-interaction' => true])
+            ->assertSuccessful();
+
+        $this->assertCommandExecutedWithBasicInstall();
+        $this->assertCommandExecutedWithoutDevTool();
+    }
 }