Merge pull request #172 from j-guyon/switch-cron-expresion-deps

Switch to dragonmantank/cron-expression 3.0

Author: j-guyon

Tests/Constraints/CronExpressionValidatorTest.php

@@ -33,7 +33,6 @@ public function getValidValues()
             ['@daily'],
             ['@yearly'],
             ['*/10 * * * *'],
-            ['* * * * * *'], // Remove this value from valid options at 3.0 release.
         ];
     }
 
@@ -62,9 +61,8 @@ public function getInvalidValues()
             ['sometimes'],
             ['never'],
             ['*****'],
-            // Uncomment following values at 3.0 release.
-            // array('* * * * * * *'),
-            // array('* * * * * *'),
+            ['* * * * * * *'],
+            ['* * * * * *'],
         ];
     }
 }

Validator/Constraints/CronExpressionValidator.php

@@ -28,15 +28,6 @@ public function validate($value, Constraint $constraint)
         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, [], $value);
         }
     }

composer.json

@@ -16,7 +16,7 @@
         "symfony/console": "^3.4|^4.3|^5.0",
         "doctrine/orm": "^2.5.11",
         "doctrine/doctrine-bundle": "^1.6.10|^2.0",
-        "mtdowling/cron-expression": "^1.2",
+        "dragonmantank/cron-expression": "^3.0",
         "symfony/framework-bundle": "^3.4|^4.3|^5.0",
         "symfony/twig-bundle": "^3.4|^4.3|^5.0",
         "symfony/translation": "^3.4|^4.3|^5.0",