formatting

Author: taylorotwell

src/NewCommand.php

@@ -27,8 +27,8 @@ protected function configure()
             ->addArgument('name', InputArgument::OPTIONAL)
             ->addOption('dev', null, InputOption::VALUE_NONE, 'Installs the latest "development" release')
             ->addOption('jet', null, InputOption::VALUE_NONE, 'Installs the Laravel Jetstream scaffolding')
-            ->addOption('stack', null, InputOption::VALUE_OPTIONAL, 'The Jetstream stack')
-            ->addOption('teams', null, InputOption::VALUE_OPTIONAL, 'Install Jetstream teams')
+            ->addOption('stack', null, InputOption::VALUE_OPTIONAL, 'The Jetstream stack that should be installed')
+            ->addOption('teams', null, InputOption::VALUE_NONE, 'Indicates whether Jetstream should be scaffolded with team support')
             ->addOption('force', 'f', InputOption::VALUE_NONE, 'Forces install even if the directory already exists');
     }
 
@@ -50,9 +50,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $stack = $this->jetstreamStack($input, $output);
 
-            $teams = ! is_null($input->getOption('teams'))
-                ? (bool) $input->getOption('teams')
-                : (new SymfonyStyle($input, $output))->confirm('Will your application use teams?', false);
+            $teams = $input->getOption('teams') === true
+                    ? (bool) $input->getOption('teams')
+                    : (new SymfonyStyle($input, $output))->confirm('Will your application use teams?', false);
         } else {
             $output->write(PHP_EOL.'<fg=red> _                               _
 | |                             | |
@@ -141,6 +141,33 @@ protected function installJetstream(string $directory, string $stack, bool $team
         $this->runCommands($commands, $input, $output);
     }
 
+    /**
+     * Determine the stack for Jetstream.
+     *
+     * @param  \Symfony\Component\Console\Input\InputInterface  $input
+     * @param  \Symfony\Component\Console\Output\OutputInterface  $output
+     * @return string
+     */
+    protected function jetstreamStack(InputInterface $input, OutputInterface $output)
+    {
+        $stacks = [
+            'livewire',
+            'inertia',
+        ];
+
+        if ($input->getOption('stack') && in_array($input->getOption('stack'), $stacks)) {
+            return $input->getOption('stack');
+        }
+
+        $helper = $this->getHelper('question');
+
+        $question = new ChoiceQuestion('Which Jetstream stack do you prefer?', $stacks);
+
+        $output->write(PHP_EOL);
+
+        return $helper->ask($input, new SymfonyStyle($input, $output), $question);
+    }
+
     /**
      * Verify that the application does not already exist.
      *
@@ -239,31 +266,4 @@ protected function replaceInFile(string $search, string $replace, string $file)
             str_replace($search, $replace, file_get_contents($file))
         );
     }
-
-    /**
-     * Determine the stack for Jetstream.
-     *
-     * @param  \Symfony\Component\Console\Input\InputInterface  $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface  $output
-     * @return string
-     */
-    protected function jetstreamStack(InputInterface $input, OutputInterface $output)
-    {
-        $stacks = [
-            'livewire',
-            'inertia',
-        ];
-
-        if ($input->getOption('stack') && in_array($input->getOption('stack'), $stacks)) {
-            return $input->getOption('stack');
-        }
-
-        $helper = $this->getHelper('question');
-
-        $question = new ChoiceQuestion('Which Jetstream stack do you prefer?', $stacks);
-
-        $output->write(PHP_EOL);
-
-        return $helper->ask($input, new SymfonyStyle($input, $output), $question);
-    }
 }