fix: correct bad merge

Author: gsdevme

Command/AddRecurringConsoleJobToQueueCommand.php

@@ -106,9 +106,19 @@ private function addRecurringJobs(OutputInterface $output)
                     continue;
                 }
             }
+
+            $command = $configuration->getCommand();
+            $arguments = [];
+
+            // i.e. does the command already have options or arguments within the string
+            if (stripos($configuration->getCommand(), ' ') !== false) {
+                $command = trim(strstr($configuration->getCommand(), ' ', true));
+                $arguments = explode(' ', trim(strstr($configuration->getCommand(), ' ', false)));
+            }
+
             $this->jobManager->addConsoleCommandJob(
-                $configuration->getCommand(),
-                [],
+                $command,
+                $arguments,
                 $configuration->getTopic(),
                 $configuration->getTimeout(),
                 $configuration->getTimeout()

Command/AddScheduleJobToQueueCommand.php

@@ -2,6 +2,7 @@
 
 namespace Markup\JobQueueBundle\Command;
 
+use Markup\JobQueueBundle\Entity\ScheduledJob;
 use Markup\JobQueueBundle\Service\JobManager;
 use Markup\JobQueueBundle\Service\ScheduledJobService;
 use Psr\Log\LoggerInterface;
@@ -55,12 +56,18 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if ($jobs = $this->scheduledJobService->getUnqueuedJobs()) {
+        $jobs = $this->scheduledJobService->getUnqueuedJobs();
+
+        if ($jobs) {
             foreach ($jobs as $job) {
+                if (!$job instanceof ScheduledJob) {
+                    continue;
+                }
+
                 try {
                     $this->jobManager->addConsoleCommandJob(
                         $job->getJob(),
-                        [],
+                        $job->getArguments(),
                         $job->getTopic(),
                         3600,
                         3600

Entity/ScheduledJob.php

@@ -41,13 +41,20 @@ class ScheduledJob
     private $updated;
 
     /**
-     * @param mixed $job
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * @param string $job
+     * @param array $arguments
      * @param mixed $scheduledTime
      * @param mixed $topic
      */
-    function __construct($job, $scheduledTime, $topic)
+    function __construct(string $job, array $arguments, $scheduledTime, $topic)
     {
         $this->job = $job;
+        $this->arguments = $arguments;
         $this->scheduledTime = $scheduledTime;
         $this->topic = $topic;
         $this->queued = false;
@@ -78,6 +85,11 @@ public function getJob()
         return $this->job;
     }
 
+    public function getArguments(): array
+    {
+        return $this->arguments;
+    }
+
     /**
      * @return string
      */

Job/ConsoleCommandJob.php

@@ -22,11 +22,11 @@ public function run(ParameterBagInterface $parameterBag): string
         ini_set('max_execution_time', 7200);
         $command = [];
 
+        $command[] = $parameterBag->get('markup_job_queue.php_bin_path');
         $command[] = $this->getConsolePath($parameterBag->get('markup_job_queue.console_dir'));
+        $command[] = $this->getCommand();
 
-        $command[] = $this->args['command'];
-
-        foreach ($this->args['arguments'] as $argument) {
+        foreach ($this->getArguments() as $argument) {
             $command[] = $argument;
         };
 
@@ -57,7 +57,7 @@ public function run(ParameterBagInterface $parameterBag): string
             if (!$process->isSuccessful()) {
                 $message = sprintf(
                     'A job `%s` failed with topic `%s` with output:%s and the error output: %s',
-                    $this->args['command'],
+                    $this->getCommand(),
                     $this->topic,
                     $process->getOutput(),
                     $process->getErrorOutput()
@@ -102,6 +102,11 @@ public function getCommand()
         return $this->getArgs()['command'];
     }
 
+    public function getArguments(): array
+    {
+        return $this->getArgs()['arguments'] ?? [];
+    }
+
     /**
      * @param  string $kernelDir
      * @return string

Model/Job.php

@@ -21,7 +21,7 @@ abstract class Job
      * @param string $topic
      */
     final public function __construct(
-        array $args = array(),
+        array $args = [],
         $topic = 'default'
     ) {
         $this->args = $args;

Model/ScheduledJobRepositoryInterface.php

@@ -7,7 +7,7 @@
 interface ScheduledJobRepositoryInterface
 {
     /**
-     * @return mixed
+     * @return iterable<ScheduledJob>
      */
     public function fetchUnqueuedJobs();
 

Publisher/JobPublisher.php

@@ -83,7 +83,7 @@ public function publish(Job $job)
             // log the job as existing
             if ($job instanceof ConsoleCommandJob) {
                 $uuid = Uuid::uuid4()->toString();
-                $log = new JobLog($job->getCommand(), $uuid, $job->getTopic());
+                $log = new JobLog(trim(sprintf('%s %s', $job->getCommand(), implode(' ', $job->getArguments()))), $uuid, $job->getTopic());
 
                 $this->jobLogRepository->add($log);
 

Resources/config/doctrine/ScheduledJob.orm.yml

@@ -10,7 +10,9 @@ Markup\JobQueueBundle\Entity\ScheduledJob:
   fields:
     job:
       type: string
-      length: 2048
+      length: 256
+    arguments:
+      type: array
     topic:
       type: string
       length: 60

Resources/config/services.yml

@@ -1,3 +1,6 @@
+parameters:
+    markup_job_queue.php_bin_path: '/usr/bin/php'
+
 services:
     markup_job_queue.publisher:
         class: Markup\JobQueueBundle\Publisher\JobPublisher

Service/JobManager.php

@@ -69,21 +69,29 @@ public function addConsoleCommandJob(string $command, array $arguments = [], $to
 
     /**
      * Adds a named command to the job queue at a specific datetime
-     * @param string    $command     A valid command for this application.
-     * @param \DateTime $dateTime    The DateTime to execute the command.
-     * @param string    $topic       The name of a valid topic.
-     * @param int       $timeout     The amount of time to allow the command to run.
-     * @param int       $idleTimeout The amount of idle time to allow the command to run. Default to the same as timeout.
+     *
+     * @param string $command A valid command for this application.
+     * @param \DateTime $dateTime The DateTime to execute the command.
+     * @param array $arguments
+     * @param string $topic The name of a valid topic.
+     * @param int $timeout The amount of time to allow the command to run.
+     * @param int $idleTimeout The amount of idle time to allow the command to run. Default to the same as timeout.
      */
-    public function addScheduledCommandJob(
+    public function addScheduledConsoleCommandJob(
         $command,
         \DateTime $dateTime,
+        array $arguments = [],
         $topic = 'default',
         $timeout = 60,
         $idleTimeout = null
     ) {
+        if (stripos($command, " ") !== false) {
+            throw new \InvalidArgumentException('Console command is not expected to have spaces within the name');
+        }
+
         $args = [];
         $args['command'] = $command;
+        $args['arguments'] = $arguments;
         $args['timeout'] = $timeout;
         $args['idleTimeout'] = $idleTimeout ?? $timeout;
         $job = new ConsoleCommandJob($args, $topic);