Merge pull request #37 from oallain/fix/console-project-dir

fix project dir for console execution
synolia · May 6, 2021 · c45592b · c45592b
2 parents 9045a1d + 3c98586
commit c45592b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
@@ -5,6 +5,7 @@ services:
         public: false
         bind:
             $logsDir: '%kernel.logs_dir%'
+            $projectDir: '%kernel.project_dir%'
 
     Synolia\SyliusSchedulerCommandPlugin\:
         resource: '../../*'

diff --git a/src/Service/ExecuteScheduleCommand.php b/src/Service/ExecuteScheduleCommand.php
@@ -25,16 +25,21 @@ class ExecuteScheduleCommand
     /** @var string */
     private $logsDir;
 
+    /** @var string */
+    private $projectDir;
+
     public function __construct(
         ScheduledCommandRepository $scheduledCommandRepository,
         EntityManagerInterface $entityManager,
         KernelInterface $kernel,
-        string $logsDir
+        string $logsDir,
+        string $projectDir
     ) {
         $this->scheduledCommandRepository = $scheduledCommandRepository;
         $this->entityManager = $entityManager;
         $this->kernel = $kernel;
         $this->logsDir = $logsDir;
+        $this->projectDir = $projectDir;
     }
 
     public function executeImmediate(string $commandId): bool
@@ -91,15 +96,17 @@ private function getLogOutput(ScheduledCommandInterface $scheduledCommand): ?str
     private function getCommandLine(ScheduledCommandInterface $scheduledCommand): string
     {
         $commandLine = sprintf(
-            'bin/console %s %s',
+            '%s/bin/console %s %s',
+            $this->projectDir,
             $scheduledCommand->getCommand(),
             $scheduledCommand->getArguments() ?? ''
         );
 
         $logOutput = $this->getLogOutput($scheduledCommand);
         if (null !== $logOutput) {
             $commandLine = sprintf(
-                'bin/console %s %s >> %s 2>> %s',
+                '%s/bin/console %s %s >> %s 2>> %s',
+                $this->projectDir,
                 $scheduledCommand->getCommand(),
                 $scheduledCommand->getArguments() ?? '',
                 $logOutput,

diff --git a/tests/PHPUnit/Command/SynoliaSchedulerRunCommandTest.php b/tests/PHPUnit/Command/SynoliaSchedulerRunCommandTest.php
@@ -80,9 +80,6 @@ public function testExecuteWithANewCommandThatItMarkedAsExecuteNow(): void
         self::assertStringNotContainsString('Nothing to do', $commandTester->getDisplay());
     }
 
-    /**
-     * @group toto
-     */
     public function testExecuteNonExistentCommand(): void
     {
         $invalidCommandName = 'non:existent';