[make:command] create invokable command by default

config/help/MakeCommand.txt

@@ -3,3 +3,7 @@ The <info>%command.name%</info> command generates a new command:
 <info>php %command.full_name% app:do-something</info>
 
 If the argument is missing, the command will ask for the command name interactively.
+
+Symfony can also generate the command with the old structure (configure and execute method) instead of an invokable command.
+
+<info>php %command.full_name% --old-structure</info>

src/Maker/MakeCommand.php

@@ -18,13 +18,16 @@
 use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Bundle\MakerBundle\Util\PhpCompatUtil;
 use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
+use Symfony\Component\Console\Attribute\Argument;
 use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Attribute\Option;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Command\LazyCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
@@ -58,10 +61,22 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
     {
         $command
             ->addArgument('name', InputArgument::OPTIONAL, \sprintf('Choose a command name (e.g. <fg=yellow>app:%s</>)', Str::asCommand(Str::getRandomTerm())))
+            ->addOption('old-structure', null, InputOption::VALUE_NONE, 'Generate the command with the old structure (configure and execute method) instead of an invokable command?')
             ->setHelp($this->getHelpFileContents('MakeCommand.txt'))
         ;
     }
 
+    public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
+    {
+        if (!$input->getOption('old-structure')) {
+            $description = $command->getDefinition()->getOption('old-structure')->getDescription();
+            $question = new ConfirmationQuestion($description, false);
+            $isUsingOldStructure = $io->askQuestion($question);
+
+            $input->setOption('old-structure', $isUsingOldStructure);
+        }
+    }
+
     public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void
     {
         $commandName = trim($input->getArgument('name'));
@@ -74,25 +89,44 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             \sprintf('The "%s" command name is not valid because it would be implemented by "%s" class, which is not valid as a PHP class name (it must start with a letter or underscore, followed by any number of letters, numbers, or underscores).', $commandName, Str::asClassName($commandName, 'Command'))
         );
 
-        $useStatements = new UseStatementGenerator([
-            Command::class,
-            InputArgument::class,
-            InputInterface::class,
-            InputOption::class,
-            OutputInterface::class,
-            SymfonyStyle::class,
-            AsCommand::class,
-        ]);
+        if ($input->getOption('old-structure')) {
+            $useStatements = new UseStatementGenerator([
+                Command::class,
+                InputArgument::class,
+                InputInterface::class,
+                InputOption::class,
+                OutputInterface::class,
+                SymfonyStyle::class,
+                AsCommand::class,
+            ]);
 
-        $generator->generateClass(
-            $commandClassNameDetails->getFullName(),
-            'command/Command.tpl.php',
-            [
-                'use_statements' => $useStatements,
-                'command_name' => $commandName,
-                'set_description' => !class_exists(LazyCommand::class),
-            ]
-        );
+            $generator->generateClass(
+                $commandClassNameDetails->getFullName(),
+                'command/Command.tpl.php',
+                [
+                    'use_statements' => $useStatements,
+                    'command_name' => $commandName,
+                    'set_description' => !class_exists(LazyCommand::class),
+                ]
+            );
+        } else {
+            $useStatements = new UseStatementGenerator([
+                Command::class,
+                SymfonyStyle::class,
+                AsCommand::class,
+                Argument::class,
+                Option::class,
+            ]);
+
+            $generator->generateClass(
+                $commandClassNameDetails->getFullName(),
+                'command/InvokableCommand.tpl.php',
+                [
+                    'use_statements' => $useStatements,
+                    'command_name' => $commandName,
+                ]
+            );
+        }
 
         $generator->writeChanges();
 

templates/command/InvokableCommand.tpl.php

@@ -0,0 +1,32 @@
+<?= "<?php\n"; ?>
+
+namespace <?= $namespace; ?>;
+
+<?= $use_statements; ?>
+
+#[AsCommand(
+    name: '<?= $command_name; ?>',
+    description: 'Add a short description for your command',
+)]
+class <?= $class_name; ?>
+{
+    public function __invoke(
+        SymfonyStyle                                                  $symfonyStyle,
+        #[Argument('Required argument description')] string           $requiredArg,
+        #[Argument('Optional nullable argument description')] ?string $optionalNullableArg,
+        #[Argument('Optional non-nullable argument description')] int              $optionalNonNullableArg = 1,
+        #[Option('Option description')] string                        $option = "defaultOptionValue",
+        #[Option('Nullable option description')] ?string              $nullableOption = null,
+    ): int
+    {
+        $symfonyStyle->note(sprintf('The value of $requiredArg is: %s', $requiredArg));
+        $symfonyStyle->note(sprintf('The value of $optionalNullableArg is: %s', $optionalNullableArg));
+        $symfonyStyle->note(sprintf('The value of $optionalNonNullableArg is: %s', $optionalNonNullableArg));
+        $symfonyStyle->note(sprintf('The value of $option is: %s', $option));
+        $symfonyStyle->note(sprintf('The value of $nullableOption is: %s', $nullableOption));
+
+        $symfonyStyle->success('You have a new command! Now make it your own! Pass --help to see your options.');
+
+        return Command::SUCCESS;
+    }
+}

tests/Maker/MakeCommandTest.php

@@ -25,11 +25,26 @@ protected function getMakerClass(): string
 
     public function getTestDetails(): \Generator
     {
-        yield 'it_makes_a_command_no_attributes' => [$this->createMakerTest()
+        yield 'it_makes_an_invokable_command_no_attributes' => [$this->createMakerTest()
             ->run(function (MakerTestRunner $runner) {
                 $runner->runMaker([
                     // command name
                     'app:foo',
+                    // create invokable command by default
+                    '',
+                ]);
+
+                $this->runCommandTest($runner, 'it_makes_a_command.php');
+            }),
+        ];
+
+        yield 'it_makes_an_old_structured_command_no_attributes' => [$this->createMakerTest()
+            ->run(function (MakerTestRunner $runner) {
+                $runner->runMaker([
+                    // command name
+                    'app:foo',
+                    // create invokable command by default
+                    'yes',
                 ]);
 
                 $this->runCommandTest($runner, 'it_makes_a_command.php');
@@ -41,6 +56,8 @@ public function getTestDetails(): \Generator
                 $runner->runMaker([
                     // command name
                     'app:foo',
+                    // create invokable command by default
+                    '',
                 ]);
 
                 $this->runCommandTest($runner, 'it_makes_a_command.php');
@@ -63,6 +80,8 @@ public function getTestDetails(): \Generator
                 $runner->runMaker([
                     // command name
                     'app:foo',
+                    // create invokable command by default
+                    '',
                 ]);
 
                 $this->runCommandTest($runner, 'it_makes_a_command_in_custom_namespace.php');