Updated dependencies, removed phive (#53)

norberttech · web-flow · commit 595429a6cb85 · 2021-05-02T11:22:46.000+02:00
* Updated dependencies, removed phive

* Updated calendar dependency constraint
diff --git a/.gitattributes b/.gitattributes
@@ -3,11 +3,11 @@
 /composer.lock export-ignore
 /.github/ export-ignore
 /docs export-ignore
+/tools export-ignore
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.php_cs export-ignore
-/.phive export-ignore
 /psalm.xml export-ignore
 /phpstan.neon export-ignore
 /phpunit.xml export-ignore
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "composer"
+    directory: "/tools"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -6,7 +6,7 @@ on:
         branches:
             - "1.x"
     schedule:
-        - cron:  '* 8 * * *'
+        - cron:  '0 8 * * *'
 
 jobs:
   mutation:
diff --git a/.github/workflows/static-analyze.yml b/.github/workflows/static-analyze.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - "1.x"
   schedule:
-    - cron:  '* 8 * * *'
+    - cron:  '0 8 * * *'
 
 jobs:
   static-analyze:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - "1.x"
   schedule:
-    - cron:  '* 8 * * *'
+    - cron:  '0 8 * * *'
 
 jobs:
   tests:
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 vendor
-tools
 *.cache
 var
diff --git a/.phive/phars.xml b/.phive/phars.xml
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.2",
-        "aeon-php/calendar": ">=0.14.0",
+        "aeon-php/calendar": ">=0.18.0",
         "twig/twig": "^1.43|^2.10|^3"
     },
     "license": "MIT",
@@ -34,21 +34,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"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-latest": "1.0-dev"
-        }
+        "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"
+        ]
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/infection.json b/infection.json
@@ -29,7 +29,7 @@
     },
     "testFramework": "phpunit",
     "phpUnit": {
-        "customPath": "tools\/phpunit.phar"
+        "customPath": "tools\/vendor\/bin\/phpunit"
     },
     "bootstrap": "./vendor/autoload.php",
     "minMsi": 100,
diff --git a/tests/Aeon/Twig/Tests/Integration/Fixtures/filters/aeon_interval.txt b/tests/Aeon/Twig/Tests/Integration/Fixtures/filters/aeon_interval.txt
@@ -29,7 +29,6 @@
     2020-01-08
     2020-01-09
     2020-01-10
-    2020-01-11
 
     2020-01-01
     2020-01-02
diff --git a/tests/Aeon/Twig/Tests/Unit/CalendarExtensionTest.php b/tests/Aeon/Twig/Tests/Unit/CalendarExtensionTest.php
@@ -182,6 +182,7 @@ public function test_aeon_current_year() : void
     public function test_aeon_interval_throws_exception_when_invalid_type() : void
     {
         $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid interval type: invalid interval');
 
         $extension = new CalendarExtension(new GregorianCalendarStub(TimeZone::UTC()));
         $extension->aeon_interval('invalid interval');
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -0,0 +1 @@
+vendor
diff --git a/tools/composer.json b/tools/composer.json
@@ -0,0 +1,12 @@
+{
+    "name": "aeon-php/calendar-twig-tools",
+    "description": "Aeon PHP Calendar Twig - Tools",
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "vimeo/psalm": "^4.6",
+        "phpstan/phpstan": "^0.12.82",
+        "infection/infection": "^0.22.1",
+        "phpbench/phpbench": "^1.0.0-alpha7",
+        "friendsofphp/php-cs-fixer": "^2.18"
+    }
+}
diff --git a/tools/composer.lock b/tools/composer.lock

-Original file line number
+Diff line change
@@ @@ -1,4 +1,3 @@ @@
 vendor
 -tools
 *.cache
 var