Convert remaining commands + remove old tests

Author: jasonmccreary

shift-cli

@@ -1,20 +1,19 @@
 #!/usr/bin/env php
 <?php
-// application.php
 
-require __DIR__.'/vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
-use Illuminate\Support\Env;
-use Shift\Cli\Support\TaskManifest;
-use Symfony\Component\Console\Application;
 use Shift\Cli\Commands\DiscoverCommand;
-//use Shift\Cli\Commands\HelpCommand;
-use Shift\Cli\Commands\RunCommand;
 use Shift\Cli\Commands\PublishCommand;
+use Shift\Cli\Commands\RunCommand;
+use Shift\Cli\Support\TaskManifest;
+use Symfony\Component\Console\Application;
 
+$taskManifest = new TaskManifest(getenv('COMPOSER_VENDOR_DIR') ?: getcwd() . '/vendor');
 
-$command = new RunCommand(new TaskManifest(Env::get('COMPOSER_VENDOR_DIR') ?: getcwd() . '/vendor'));
 $application = new Application();
-$application->add($command);
-$application->setDefaultCommand($command->getName());
+$application->add(new DiscoverCommand($taskManifest));
+$application->add(new PublishCommand());
+$application->add(new RunCommand($taskManifest));
+$application->setDefaultCommand('run');
 $application->run();

src/Commands/DiscoverCommand.php

@@ -2,24 +2,38 @@
 
 namespace Shift\Cli\Commands;
 
-use Illuminate\Console\Command;
 use Shift\Cli\Support\TaskManifest;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(
+    name: 'discover',
+    description: 'Load any additional automated tasks within the project',
+)]
 class DiscoverCommand extends Command
 {
-    protected $signature = 'discover';
+    private TaskManifest $taskManifest;
 
-    protected $description = 'Load any additional automated tasks within the project';
+    public function __construct(TaskManifest $taskManifest)
+    {
+        parent::__construct();
+
+        $this->taskManifest = $taskManifest;
+    }
 
-    public function handle(TaskManifest $manifest)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->components->info('Discovering tasks');
+        $output->writeln('Discovering tasks');
 
-        $manifest->build();
+        $this->taskManifest->build();
 
-        collect($manifest->list())
+        collect($this->taskManifest->list())
             ->keys()
-            ->each(fn ($task) => $this->components->task($task))
-            ->whenNotEmpty(fn () => $this->newLine());
+            ->each(fn ($task) => $output->writeln($task))
+            ->whenNotEmpty(fn () => $output->writeln(''));
+
+        return 0;
     }
 }

src/Commands/PublishCommand.php

@@ -2,19 +2,28 @@
 
 namespace Shift\Cli\Commands;
 
-use LaravelZero\Framework\Commands\Command;
 use Shift\Cli\Sdk\Facades\Configuration;
-
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand(
+    name: 'publish',
+    description: 'Publish a default Shift CLI configuration file',
+)]
 class PublishCommand extends Command
 {
-    protected $signature = 'publish {--force : Overwrite any existing files}';
-
-    protected $description = 'Publish a default Shift CLI configuration file';
+    protected function configure(): void
+    {
+        $this->addOption('force', mode: InputOption::VALUE_NONE, description: 'Overwrite existing configuration file');
+    }
 
-    public function handle(): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if (file_exists('shift-cli.json') && ! $this->option('force')) {
-            $this->line('<comment>A configuration file already exists.</comment> Use the `--force` option to overwrite yours.');
+        if (file_exists('shift-cli.json') && ! $input->getOption('force')) {
+            $output->writeln('<comment>A configuration file already exists.</comment> Use the `--force` option to overwrite yours.');
 
             return 1;
         }