add typehints to async command classes.

Author: makasim

Resources/config/services.yml

@@ -3,6 +3,6 @@ services:
         class: 'Enqueue\AsyncCommand\RunCommandProcessor'
         public: public
         arguments:
-            - '%kernel.root_dir%/..'
+            - '%kernel.project_dir%'
         tags:
             - { name: 'enqueue.client.processor' }

RunCommand.php

@@ -24,36 +24,13 @@ final class RunCommand implements \JsonSerializable
      * @param string[] $arguments
      * @param string[] $options
      */
-    public function __construct($command, array $arguments = [], array $options = [])
+    public function __construct(string $command, array $arguments = [], array $options = [])
     {
         $this->command = $command;
         $this->arguments = $arguments;
         $this->options = $options;
     }
 
-    /**
-     * @return string
-     */
-    public function getCommandLine()
-    {
-        $optionsString = '';
-        foreach ($this->options as $name => $value) {
-            $optionsString .= " $name=$value";
-        }
-        $optionsString = trim($optionsString);
-
-        $argumentsString = '';
-        foreach ($this->arguments as $value) {
-            $argumentsString .= " $value";
-        }
-        $argumentsString = trim($argumentsString);
-
-        return trim($this->command.' '.$argumentsString.' '.$optionsString);
-    }
-
-    /**
-     * @return string
-     */
     public function getCommand(): string
     {
         return $this->command;
@@ -75,7 +52,7 @@ public function getOptions(): array
         return $this->options;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'command' => $this->command,
@@ -84,12 +61,7 @@ public function jsonSerialize()
         ];
     }
 
-    /**
-     * @param string $json
-     *
-     * @return self
-     */
-    public static function jsonUnserialize($json)
+    public static function jsonUnserialize(string $json): self
     {
         $data = json_decode($json, true);
         if (JSON_ERROR_NONE !== json_last_error()) {

RunCommandProcessor.php

@@ -17,28 +17,32 @@ final class RunCommandProcessor implements PsrProcessor, CommandSubscriberInterf
      */
     private $projectDir;
 
-    public function __construct($projectDir)
+    public function __construct(string $projectDir)
     {
         $this->projectDir = $projectDir;
     }
 
-    public function process(PsrMessage $message, PsrContext $context)
+    public function process(PsrMessage $message, PsrContext $context): Result
     {
         $command = RunCommand::jsonUnserialize($message->getBody());
 
         $phpBin = (new PhpExecutableFinder())->find();
         $consoleBin = file_exists($this->projectDir.'/bin/console') ? './bin/console' : './app/console';
 
-        $process = new Process($phpBin.' '.$consoleBin.' '.$command->getCommandLine(), $this->projectDir);
+        $process = new Process($phpBin.' '.$consoleBin.' '.$this->getCommandLine($command), $this->projectDir);
 
         $process->run();
 
-        $result = new RunCommandResult($process->getExitCode(), $process->getOutput(), $process->getErrorOutput());
+        if ($message->getReplyTo()) {
+            $result = new CommandResult($process->getExitCode(), $process->getOutput(), $process->getErrorOutput());
 
-        return Result::reply($context->createMessage(json_encode($result)));
+            return Result::reply($context->createMessage(json_encode($result)));
+        }
+
+        return Result::ack();
     }
 
-    public static function getSubscribedCommand()
+    public static function getSubscribedCommand(): array
     {
         return [
             'processorName' => Commands::RUN_COMMAND,
@@ -47,4 +51,24 @@ public static function getSubscribedCommand()
             'exclusive' => true,
         ];
     }
+
+    /**
+     * @return string
+     */
+    private function getCommandLine(RunCommand $command): string
+    {
+        $optionsString = '';
+        foreach ($command->getOptions() as $name => $value) {
+            $optionsString .= " $name=$value";
+        }
+        $optionsString = trim($optionsString);
+
+        $argumentsString = '';
+        foreach ($command->getArguments() as $value) {
+            $argumentsString .= " $value";
+        }
+        $argumentsString = trim($argumentsString);
+
+        return trim($command->getCommand().' '.$argumentsString.' '.$optionsString);
+    }
 }

RunCommandResult.php

@@ -8,7 +8,8 @@
     "require": {
         "php": ">=7.1",
         "enqueue/enqueue": "0.9.x-dev",
-        "symfony/console": "^3.4|^4"
+        "symfony/console": "^3.4|^4",
+        "symfony/process": "^3.4|^4"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",