Merge pull request #31 from totten/master-symfony-7

Update `Command` classes for Symfony 7 compatibility (#28)

Author: totten

src/Command/CompileCommand.php

@@ -6,6 +6,7 @@
 use Civi\CompilePlugin\TaskRunner;
 use Civi\CompilePlugin\Util\EnvHelper;
 use Composer\Script\ScriptEvents;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -37,7 +38,7 @@ protected function configure()
     protected function initialize(
         InputInterface $input,
         OutputInterface $output
-    ) {
+    ): void {
         $so = $input->getOption('soft-options');
         if ($so) {
             $json = json_decode(base64_decode($so), 1);
@@ -51,7 +52,7 @@ protected function initialize(
         parent::initialize($input, $output);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isVerbose()) {
             EnvHelper::set('COMPOSER_COMPILE_PASSTHRU', 'always');
@@ -75,6 +76,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $taskRunner->runDefault($taskList, $input->getOption('dry-run'));
         }
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Command/CompileListCommand.php

@@ -5,6 +5,7 @@
 use Civi\CompilePlugin\TaskList;
 use Civi\CompilePlugin\TaskRunner;
 use Civi\CompilePlugin\Util\TaskUIHelper;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -23,7 +24,7 @@ protected function configure()
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $taskList = new TaskList($this->getComposer(), $this->getIO());
         $taskList->load();
@@ -42,6 +43,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->write(TaskUIHelper::formatTaskTable($tasks, ['active', 'id', 'title', 'action']));
         }
-        return 0;
+      return Command::SUCCESS;
     }
 }

src/Command/CompileWatchCommand.php

@@ -8,6 +8,7 @@
 use Civi\CompilePlugin\Util\ShellRunner;
 use Composer\EventDispatcher\ScriptExecutionException;
 use Lurker\ResourceWatcher;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -27,7 +28,7 @@ protected function configure()
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isVerbose()) {
             EnvHelper::set('COMPOSER_COMPILE_PASSTHRU', 'always');
@@ -110,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln("Polling", OutputInterface::VERBOSITY_VERY_VERBOSE);
             $watcher->start($intervalMicroseconds, $intervalMicroseconds);
         }
-        return 0;
+      return Command::SUCCESS;
     }
 
     /**