Merge pull request #61 from kbond/additional-hash-aliases

Add additional cron hash aliases
zenstruck · Apr 13, 2022 · 30bb9d1 · 30bb9d1
2 parents c910a93 + 613bbec
commit 30bb9d1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # The ScheduleBundle
 
 [![CI](https://github.com/zenstruck/schedule-bundle/workflows/CI/badge.svg)](https://github.com/zenstruck/schedule-bundle/actions?query=workflow%3ACI)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/zenstruck/schedule-bundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/zenstruck/schedule-bundle/?branch=master)
 [![Code Coverage](https://codecov.io/gh/zenstruck/schedule-bundle/branch/master/graph/badge.svg?token=SZE54O8YST)](https://codecov.io/gh/zenstruck/schedule-bundle)
 [![Latest Version](https://img.shields.io/packagist/v/zenstruck/schedule-bundle.svg)](https://packagist.org/packages/zenstruck/schedule-bundle)
 [![Total Downloads](https://img.shields.io/packagist/dt/zenstruck/schedule-bundle.svg)](https://packagist.org/packages/zenstruck/schedule-bundle)

diff --git a/composer.json b/composer.json
@@ -13,23 +13,23 @@
     ],
     "require": {
         "php": ">=7.2",
-        "dragonmantank/cron-expression": "^2.3",
+        "dragonmantank/cron-expression": "^2.3|^3.0",
         "symfony/console": "^4.0|^5.0|^6.0",
         "symfony/dependency-injection": "^4.0|^5.0|^6.0",
         "symfony/event-dispatcher": "^4.0|^5.0|^6.0",
         "symfony/http-kernel": "^4.0|^5.0|^6.0",
         "symfony/polyfill-php80": "^1.15"
     },
     "require-dev": {
-        "lorisleiva/cron-translator": "^0.1.0",
+        "lorisleiva/cron-translator": "^0.1.0|^0.3.1",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpstan/phpstan": "^1.4",
         "psr/log": "^1.1",
         "symfony/http-client": "^4.3|^5.0|^6.0",
         "symfony/lock": "^4.4|^5.0|^6.0",
         "symfony/mailer": "^4.4|^5.0|^6.0",
         "symfony/messenger": "^4.4|^5.0|^6.0",
-        "symfony/phpunit-bridge": "^5.3",
+        "symfony/phpunit-bridge": "^6.0",
         "symfony/process": "^4.2|^5.0|^6.0"
     },
     "suggest": {

diff --git a/doc/define-tasks.md b/doc/define-tasks.md
@@ -407,15 +407,19 @@ is to account for February which has a minimum of 28 days.*
 
 The following *hash* aliases are provided:
 
-| Alias       | Converts to                                                            |
-| ----------- | ---------------------------------------------------------------------- |
-| `#hourly`   | `# * * * *` (at some minute every hour)                                |
-| `#daily`    | `# # * * *` (at some time every day)                                   |
-| `#midnight` | `# #(0-2) * * *` (at some time between midnight and 2:59am, every day) |
-| `#weekly`   | `# # * * #` (at some time every week)                                  |
-| `#monthly`  | `# # # * *` (at some time on some day, once per month)                 |
-| `#annually` | `# # # # *` (at some time on some day, once per year)                  |
-| `#yearly`   | `# # # # *` (at some time on some day, once per year)                  |
+| Alias                | Converts to                                                            |
+|----------------------|------------------------------------------------------------------------|
+| `#hourly`            | `# * * * *` (at some minute every hour)                                |
+| `#daily`             | `# # * * *` (at some time every day)                                   |
+| `#midnight`          | `# #(0-2) * * *` (at some time between midnight and 2:59am, every day) |
+| `#weekly`            | `# # * * #` (at some time every week)                                  |
+| `#weekly@midnight`   | `# #(0-2) * * #` (at `#midnight` one day every week)                   |
+| `#monthly`           | `# # # * *` (at some time on some day, once per month)                 |
+| `#monthly@midnight`  | `# #(0-2) # * *` (at `#midnight` on some day, once per month)          |
+| `#annually`          | `# # # # *` (at some time on some day, once per year)                  |
+| `#annually@midnight` | `# #(0-2) # # *` (at `#midnight` on some day, once per year)           |
+| `#yearly`            | _alias for `#annually`_                                                |
+| `#yearly@midnight`   | _alias for `#annually@midnight`_                                       |
 
 **Define in [PHP](define-schedule.md#schedulebuilder-service):**
 

diff --git a/src/Schedule/CronExpression.php b/src/Schedule/CronExpression.php
@@ -28,9 +28,13 @@ final class CronExpression
         '#hourly' => '# * * * *',
         '#daily' => '# # * * *',
         '#weekly' => '# # * * #',
+        '#weekly@midnight' => '# #(0-2) * * #',
         '#monthly' => '# # # * *',
+        '#monthly@midnight' => '# #(0-2) # * *',
         '#annually' => '# # # # *',
+        '#annually@midnight' => '# #(0-2) # # *',
         '#yearly' => '# # # # *',
+        '#yearly@midnight' => '# #(0-2) # # *',
         '#midnight' => '# #(0-2) * * *',
     ];
 

diff --git a/tests/Schedule/CronExpressionTest.php b/tests/Schedule/CronExpressionTest.php
@@ -75,9 +75,13 @@ public static function hashedExpressionProvider(): array
             ['#hourly', '56 * * * *'],
             ['#daily', '56 20 * * *'],
             ['#weekly', '56 20 * * 0'],
+            ['#weekly@midnight', '56 2 * * 0'],
             ['#monthly', '56 20 1 * *'],
+            ['#monthly@midnight', '56 2 1 * *'],
             ['#yearly', '56 20 1 9 *'],
+            ['#yearly@midnight', '56 2 1 9 *'],
             ['#annually', '56 20 1 9 *'],
+            ['#annually@midnight', '56 2 1 9 *'],
             ['#midnight', '56 2 * * *'],
             ['#(1-15) * * * *', '12 * * * *'],
             ['#(1-15) * * * #(3-5)', '12 * * * 5'],