Merge branch 'v2.x'

Padam87 · Aug 3, 2022 · 0477131 · 0477131
2 parents 0660177 + e04af5e
commit 0477131
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,9 +4,11 @@ on:
   pull_request:
     branches:
       - "master"
+      - "v2.x"
   push:
     branches:
       - "master"
+      - "v2.x"
 
 jobs:
   phpunit:

diff --git a/Tests/HelperTest.php b/Tests/HelperTest.php
@@ -129,8 +129,11 @@ public function should_process_jobs()
 
         $job = $tab->getJobs()[0];
 
+        // logFile parameter
         $this->assertEquals($this->getConfig()['log_dir'] . '/myjob.log', $job->logFile);
+
+        // commandLine parameter
         $this->assertStringStartsWith($this->getConfig()['php_binary'], $job->commandLine);
-        $this->assertStringEndsWith('my:job', $job->commandLine);
+        $this->assertStringEndsWith('my:job 42 --first-option --second-option true', $job->commandLine);
     }
 }
diff --git a/Tests/Resources/Command/ProcessTestCommand.php b/Tests/Resources/Command/ProcessTestCommand.php
@@ -5,7 +5,7 @@
 use Padam87\CronBundle\Attribute\Job;
 use Symfony\Component\Console\Command\Command;
 
-#[Job(logFile: 'myjob.log')]
+#[Job(group: 'my-group', logFile: 'myjob.log', commandLine: 'my:job 42 --first-option --second-option true')]
 class ProcessTestCommand extends Command
 {
     protected static $defaultName = 'my:job';

diff --git a/Util/Helper.php b/Util/Helper.php
@@ -63,7 +63,7 @@ private function processJob(Job $job, InputInterface $input, array $config, Comm
             '%s %s %s',
             $config['php_binary'],
             realpath($_SERVER['argv'][0]),
-            $annotation->commandLine ?? $commandInstance->getName()
+            $job->commandLine ?? $commandInstance->getName()
         );
 
         if ($config['log_dir'] !== null && $job->logFile !== null) {