Merge branch 'master' into support-symfony5

Author: j-guyon

Command/ExecuteCommand.php

@@ -119,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $noneExecution = true;
         foreach ($commands as $command) {
 
-            $this->em->refresh($this->em->merge($command));
+            $this->em->refresh($this->em->find(ScheduledCommand::class, $command));
             if ($command->isDisabled() || $command->isLocked()) {
                 continue;
             }
@@ -143,7 +143,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln(
                     'Command <comment>'.$command->getCommand().
                     '</comment> should be executed - last execution : <comment>'.
-                    $command->getLastExecution()->format('d/m/Y H:i:s').'.</comment>'
+                    $command->getLastExecution()->format(\DateTimeInterface::ATOM).'.</comment>'
                 );
 
                 if (!$input->getOption('dump')) {
@@ -181,7 +181,7 @@ private function executeCommand(ScheduledCommand $scheduledCommand, OutputInterf
             $scheduledCommand = $notLockedCommand;
             $scheduledCommand->setLastExecution(new \DateTime());
             $scheduledCommand->setLocked(true);
-            $scheduledCommand = $this->em->merge($scheduledCommand);
+            $this->em->persist($scheduledCommand);
             $this->em->flush();
             $this->em->getConnection()->commit();
         } catch (\Exception $e) {
@@ -196,6 +196,9 @@ private function executeCommand(ScheduledCommand $scheduledCommand, OutputInterf
 
             return;
         }
+
+        $scheduledCommand = $this->em->find(ScheduledCommand::class, $scheduledCommand);
+
         try {
             $command = $this->getApplication()->find($scheduledCommand->getCommand());
         } catch (\InvalidArgumentException $e) {
@@ -247,10 +250,10 @@ private function executeCommand(ScheduledCommand $scheduledCommand, OutputInterf
             $this->em = $this->em->create($this->em->getConnection(), $this->em->getConfiguration());
         }
 
-        $scheduledCommand = $this->em->merge($scheduledCommand);
         $scheduledCommand->setLastReturnCode($result);
         $scheduledCommand->setLocked(false);
         $scheduledCommand->setExecuteImmediately(false);
+        $this->em->persist($scheduledCommand);
         $this->em->flush();
 
         /*

Command/MonitorCommand.php

@@ -114,7 +114,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     $command->getName(),
                     $command->getLastReturnCode(),
                     $command->getLocked(),
-                    $command->getLastExecution()->format('Y-m-d H:i')
+                    $command->getLastExecution()->format(\DateTimeInterface::ATOM)
                 );
             }
 

Resources/doc/index.md

@@ -100,7 +100,7 @@ See the [Usage](#usage) section to have more information
 
 ### 4 - Available configuration
 
-Here is the default bundle configuration.
+Here is the default bundle configuration. The flex recipe will create the scheduler.yaml file in your packages directory where you can change the base configuration.
 
 ```yaml
 jmose_command_scheduler:

Tests/Constraints/CronExpressionValidatorTest.php

@@ -22,18 +22,19 @@ protected function createValidator()
      */
     public function testValidValues($value)
     {
-        $this->validator->validate($value, new CronExpression());
+        $this->validator->validate($value, new CronExpression(array('message' => '')));
 
         $this->assertNoViolation();
     }
 
     public function getValidValues()
     {
         return array(
-            array('* * * * * *'),
+            array('* * * * *'),
             array('@daily'),
             array('@yearly'),
             array('*/10 * * * *'),
+            array('* * * * * *'), // Remove this value from valid options at 3.0 release.
         );
     }
 
@@ -61,6 +62,10 @@ public function getInvalidValues()
             array('*/5 * * * ?'),
             array('sometimes'),
             array('never'),
+            array('*****'),
+            // Uncomment following values at 3.0 release.
+            // array('* * * * * * *'),
+            // array('* * * * * *'),
         );
     }
 }

Validator/Constraints/CronExpressionValidator.php

@@ -22,18 +22,25 @@ class CronExpressionValidator extends ConstraintValidator
      */
     public function validate($value, Constraint $constraint)
     {
-        $value = (string)$value;
+        $value = (string) $value;
 
-        if (null === $value || '' === $value) {
+        if ('' === $value) {
             return;
         }
 
         try {
             CronExpressionLib::factory($value);
         } catch (\InvalidArgumentException $e) {
+            // This condition is required in order to respect BC with "mtdowling/cron-expression".
+            // It must be removed at 3.0 release.
+            // @see https://github.com/mtdowling/cron-expression/commit/56e89730e60a0e945bf4ea10c48b80a406c7e7a0.
+            if ('6 is not a valid position' === $e->getMessage()) {
+                @trigger_error($e->getMessage().' and its support is deprecated since jmose/command-scheduler-bundle 2.x.', E_USER_DEPRECATED);
+
+                return;
+            }
+
             $this->context->addViolation($constraint->message, array(), $value);
         }
-
-        return;
     }
 }

composer.json

@@ -33,7 +33,7 @@
         "liip/functional-test-bundle": "^4.2",
         "symfony/css-selector": "^3.4|^4.0|^5.0",
         "symfony/security-bundle": "^3.4|^4.0|^5.0",
-        "liip/test-fixtures-bundle": "^1.0.0"
+        "liip/test-fixtures-bundle": "^1.4.0"
     },
     "suggest": {
         "ext-pcntl": "For using the scheduler daemon"