Updated dependencies

.gitattributes

@@ -4,7 +4,7 @@
 /.github/ export-ignore
 /docs export-ignore
 /tests export-ignore
-/.phive export-ignore
+/tools export-ignore
 /benchmark export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore

.github/workflows/dependabot-auto-merge.yaml

@@ -0,0 +1,33 @@
+name: "Dependabot Auto Merge"
+
+on:
+  workflow_run:
+    types:
+      - completed
+    workflows:
+      - 'Tests'
+      - 'Mutation Tests'
+      - 'Static Analyze'
+
+jobs:
+  merge-me:
+    name: Merge me!
+    runs-on: ubuntu-latest
+    steps:
+      - # It is often a desired behavior to merge only when a workflow execution
+        # succeeds. This can be changed as needed.
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        name: Merge me!
+        uses: ridedott/merge-me-action@v2
+        with:
+          # Depending on branch protection rules, a  manually populated
+          # `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to
+          # a protected branch must be used. This secret can have an arbitrary
+          # name, as an example, this repository uses `DOTTBOTT_TOKEN`.
+          #
+          # When using a custom token, it is recommended to leave the following
+          # comment for other developers to be aware of the reasoning behind it:
+          #
+          # This must be used as GitHub Actions token does not support pushing
+          # to protected branches.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,4 +1,3 @@
 vendor
-tools
 *.cache
 var

.php_cs → .php-cs-fixer.php

@@ -4,7 +4,7 @@
     ->files()
     ->in([
         __DIR__ . '/src',
-        __DIR__ . '/tests'
+        __DIR__ . '/tests',
     ])
     ->notName('*.phpt');
 
@@ -16,7 +16,9 @@
  * This configuration was taken from https://github.com/sebastianbergmann/phpunit/blob/master/.php_cs.dist
  * and slightly adjusted.
  */
-return PhpCsFixer\Config::create()
+$config = new PhpCsFixer\Config();
+
+return $config
     ->setRiskyAllowed(true)
     ->setCacheFile(__DIR__.'/var/.php_cs.cache')
     ->setRules([
@@ -30,7 +32,6 @@
                 'continue',
                 'declare',
                 'default',
-                'die',
                 'do',
                 'exit',
                 'for',
@@ -50,7 +51,7 @@
         ],
         'braces' => true,
         'cast_spaces' => true,
-        'class_attributes_separation' => ['elements' => ['const', 'method', 'property']],
+        'class_attributes_separation' => ['elements' => ['const'=>'one', 'method'=>'one', 'property'=>'one']],
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
         'compact_nullable_typehint' => true,
@@ -61,6 +62,7 @@
         'dir_constant' => true,
         'elseif' => true,
         'encoding' => true,
+        'echo_tag_syntax' => true,
         'explicit_indirect_variable' => true,
         'explicit_string_variable' => true,
         'full_opening_tag' => true,
@@ -85,13 +87,13 @@
         'lowercase_static_reference' => true,
         'magic_constant_casing' => true,
         'magic_method_casing' => true,
-        'method_argument_space' => ['ensure_fully_multiline' => true],
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
         'modernize_types_casting' => false,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => true,
         'native_constant_invocation' => false,
         'native_function_casing' => false,
-        'native_function_invocation' => true,
+        'native_function_invocation' => ['include'=>['@all']],
         'native_function_type_declaration_casing' => true,
         'new_with_braces' => false,
         'no_alias_functions' => true,
@@ -112,7 +114,6 @@
         'no_null_property_initialization' => true,
         'no_php4_constructor' => true,
         'no_short_bool_cast' => true,
-        'no_short_echo_tag' => true,
         'no_singleline_whitespace_before_semicolons' => true,
         'no_spaces_after_function_name' => true,
         'no_spaces_around_offset' => true,
@@ -208,7 +209,7 @@
         'standardize_not_equals' => true,
         'strict_param' => true,
         'ternary_to_null_coalescing' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => [

composer.json

@@ -5,9 +5,9 @@
   "keywords": ["ratelimiter", "throttling", "rate", "limiter"],
   "prefer-stable": true,
   "require": {
-    "php": ">=7.4.2",
+    "php": "^7.4.2 || ^8.0",
     "ext-json": "*",
-    "aeon-php/calendar": ">=0.14.0",
+    "aeon-php/calendar": "^1.0",
     "aeon-php/sleep": ">=0.6.0",
     "psr/cache": "^1.0",
     "symfony/polyfill-mbstring": "^1.0"
@@ -39,16 +39,23 @@
       "@test:mutation"
     ],
     "test": [
-      "tools/phpunit.phar"
+      "tools/vendor/bin/phpunit"
     ],
     "test:mutation": [
-      "tools/infection -j2"
+      "tools/vendor/bin/infection -j2"
     ],
     "static:analyze": [
-      "tools/psalm --output-format=compact",
-      "tools/phpstan analyze -c phpstan.neon",
-      "tools/php-cs-fixer fix --dry-run"
+      "tools/vendor/bin/psalm --output-format=compact",
+      "tools/vendor/bin/phpstan analyze -c phpstan.neon",
+      "tools/vendor/bin/php-cs-fixer fix --dry-run"
     ],
-    "cs:php:fix": "tools/php-cs-fixer fix"
+    "cs:php:fix": "tools/vendor/bin/php-cs-fixer fix",
+    "tools:install": "composer install --working-dir=./tools",
+    "post-install-cmd": [
+      "@tools:install"
+    ],
+    "post-update-cmd": [
+      "@tools:install"
+    ]
   }
 }

infection.json

@@ -41,7 +41,7 @@
   },
   "testFramework": "phpunit",
   "phpUnit": {
-    "customPath": "tools\/phpunit.phar"
+    "customPath": "tools/vendor/bin/phpunit"
   },
   "bootstrap": "./vendor/autoload.php",
   "minMsi": 100,

tools/.gitignore

@@ -0,0 +1 @@
+vendor

tools/composer.json

@@ -0,0 +1,11 @@
+{
+    "name": "aeon-php/calendar-tools",
+    "description": "Aeon PHP Calendar - Tools",
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "vimeo/psalm": "^4.6",
+        "phpstan/phpstan": "^0.12.82",
+        "infection/infection": "^0.22.1",
+        "friendsofphp/php-cs-fixer": "^3.1"
+    }
+}