[make:command] use sorted use statements

src/Maker/MakeCommand.php

@@ -16,18 +16,30 @@
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
 use Symfony\Bundle\MakerBundle\Str;
+use Symfony\Bundle\MakerBundle\Util\PhpCompatUtil;
+use Symfony\Bundle\MakerBundle\Util\TemplateComponentGenerator;
 use Symfony\Component\Console\Attribute\AsCommand;
 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\Style\SymfonyStyle;
 
 /**
  * @author Javier Eguiluz <javier.eguiluz@gmail.com>
  * @author Ryan Weaver <weaverryan@gmail.com>
  */
 final class MakeCommand extends AbstractMaker
 {
+    private $phpCompatUtil;
+
+    public function __construct(PhpCompatUtil $phpCompatUtil)
+    {
+        $this->phpCompatUtil = $phpCompatUtil;
+    }
+
     public static function getCommandName(): string
     {
         return 'make:command';
@@ -38,15 +50,15 @@ public static function getCommandDescription(): string
         return 'Creates a new console command class';
     }
 
-    public function configureCommand(Command $command, InputConfiguration $inputConf)
+    public function configureCommand(Command $command, InputConfiguration $inputConfig): void
     {
         $command
             ->addArgument('name', InputArgument::OPTIONAL, sprintf('Choose a command name (e.g. <fg=yellow>app:%s</>)', Str::asCommand(Str::getRandomTerm())))
             ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeCommand.txt'))
         ;
     }
 
-    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator)
+    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void
     {
         $commandName = trim($input->getArgument('name'));
         $commandNameHasAppPrefix = 0 === strpos($commandName, 'app:');
@@ -58,13 +70,29 @@ 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 = [
+            Command::class,
+            InputArgument::class,
+            InputInterface::class,
+            InputOption::class,
+            OutputInterface::class,
+            SymfonyStyle::class,
+        ];
+
+        $canUseCommandAttribute = class_exists(AsCommand::class) && $this->phpCompatUtil->canUseAttributes();
+
+        if ($canUseCommandAttribute) {
+            $useStatements[] = AsCommand::class;
+        }
+
         $generator->generateClass(
             $commandClassNameDetails->getFullName(),
             'command/Command.tpl.php',
             [
+                'use_statements' => TemplateComponentGenerator::generateUseStatements($useStatements),
                 'command_name' => $commandName,
                 'set_description' => !class_exists(LazyCommand::class),
-                'use_command_attribute' => 80000 <= \PHP_VERSION_ID && class_exists(AsCommand::class),
+                'use_command_attribute' => $canUseCommandAttribute,
             ]
         );
 
@@ -77,7 +105,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         ]);
     }
 
-    public function configureDependencies(DependencyBuilder $dependencies)
+    public function configureDependencies(DependencyBuilder $dependencies): void
     {
         $dependencies->addClassDependency(
             Command::class,

src/Resources/config/makers.xml

@@ -17,6 +17,7 @@
             </service>
 
             <service id="maker.maker.make_command" class="Symfony\Bundle\MakerBundle\Maker\MakeCommand">
+                <argument type="service" id="maker.php_compat_util" />
                 <tag name="maker.command" />
             </service>
 

src/Resources/skeleton/command/Command.tpl.php

@@ -2,25 +2,17 @@
 
 namespace <?= $namespace; ?>;
 
-<?php if ($use_attributes && $use_command_attribute): ?>
-use Symfony\Component\Console\Attribute\AsCommand;
-<?php endif; ?>
-use Symfony\Component\Console\Command\Command;
-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\Style\SymfonyStyle;
-
-<?php if ($use_attributes && $use_command_attribute): ?>
+<?= $use_statements; ?>
+
+<?php if ($use_command_attribute): ?>
 #[AsCommand(
     name: '<?= $command_name; ?>',
     description: 'Add a short description for your command',
 )]
 <?php endif; ?>
 class <?= $class_name; ?> extends Command
 {
-<?php if (!$use_attributes || !$use_command_attribute): ?>
+<?php if (!$use_command_attribute): ?>
     protected static $defaultName = '<?= $command_name; ?>';
     protected static $defaultDescription = 'Add a short description for your command';