Merge branch '10.x' into 10/deps

orchestral · Dec 26, 2024 · 20290d9 · 20290d9
2 parents ec18361 + 709e2b0
commit 20290d9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/src/Console/DevToolCommand.php b/src/Console/DevToolCommand.php
@@ -285,9 +285,7 @@ protected function promptForMissingArguments(InputInterface $input, OutputInterf
     {
         $install = null;
 
-        if ($input->getOption('skip-install') === true) {
-            $install = false;
-        } elseif (\is_null($input->getOption('install'))) {
+        if (\is_null($input->getOption('install'))) {
             $install = confirm('Run Workbench installation?', true);
         }
 

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -49,19 +49,17 @@ protected function initialize(InputInterface $input, OutputInterface $output)
      */
     public function handle(Filesystem $filesystem)
     {
-        if (! $this->option('skip-devtool')) {
-            $devtool = match (true) {
-                \is_bool($this->option('devtool')) => $this->option('devtool'),
-                default => $this->components->confirm('Install Workbench DevTool?', true),
-            };
-
-            if ($devtool === true) {
-                $this->call('workbench:devtool', [
-                    '--force' => $this->option('force'),
-                    '--no-install' => true,
-                    '--basic' => $this->option('basic'),
-                ]);
-            }
+        $devtool = match (true) {
+            \is_bool($this->option('devtool')) => $this->option('devtool'),
+            default => $this->components->confirm('Install Workbench DevTool?', true),
+        };
+
+        if ($devtool === true) {
+            $this->call('workbench:devtool', [
+                '--force' => $this->option('force'),
+                '--no-install' => true,
+                '--basic' => $this->option('basic'),
+            ]);
         }
 
         $workingPath = package_path();
@@ -243,9 +241,7 @@ protected function promptForMissingArguments(InputInterface $input, OutputInterf
     {
         $devtool = null;
 
-        if ($input->getOption('skip-devtool') === true) {
-            $devtool = false;
-        } elseif (\is_null($input->getOption('devtool'))) {
+        if (\is_null($input->getOption('devtool'))) {
             $devtool = confirm('Run Workbench DevTool installation?', true);
         }