Update psalm, infection, mago, ... (#506)

azjezz · Jan 31, 2025 · 96a3e72 · 96a3e72
1 parent 14ad277
commit 96a3e72
Show file tree

Hide file tree

Showing 13 changed files with 1,050 additions and 718 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -24,11 +24,8 @@ jobs:
         run: |
           make install -j10 -O
 
-      - name: "install mago"
-        run: wget -qO- https://carthage.software/mago.sh | bash -s -- --install-dir="/usr/local/bin"
-
       - name: "formatting"
-        run: mago fmt --dry-run
+        run: ./vendor/bin/mago fmt --dry-run
 
       - name: "linting"
-        run: mago lint --reporting-format=github
+        run: ./vendor/bin/mago lint --reporting-format=github
diff --git a/Makefile b/Makefile
@@ -2,15 +2,15 @@ help:
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_\-\.]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
 install:                                                              			## install all dependencies for a development environment
-	COMPOSER_IGNORE_PLATFORM_REQ=php+ composer install
+	composer install
 
 coding-standard-fix:                                                            ## apply automated coding standard fixes
-	mago fix
-	mago fmt
+	./vendor/bin/mago fix
+	./vendor/bin/mago fmt
 
 coding-standard-check:                                                          ## check coding-standard compliance
-	mago lint
-	mago fmt --dry-run
+	./vendor/bin/mago lint
+	./vendor/bin/mago fmt --dry-run
 
 benchmarks:                                                                     ## run benchmarks
 	./vendor/bin/phpbench run --config config/phpbench.json

diff --git a/composer.json b/composer.json
@@ -21,10 +21,11 @@
     "require-dev": {
         "phpbench/phpbench": "^1.2.15",
         "phpunit/phpunit": "^9.6.18",
-        "vimeo/psalm": "^5.23.1",
+        "vimeo/psalm": "^6.0.0",
         "php-standard-library/psalm-plugin": "^2.3.0",
         "php-coveralls/php-coveralls": "^2.7.0",
-        "roave/infection-static-analysis-plugin": "^1.35.0"
+        "roave/infection-static-analysis-plugin": "^1.36.0",
+        "carthage-software/mago": "~0.7"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +45,8 @@
     },
     "config": {
         "allow-plugins": {
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "carthage-software/mago": true
         }
     },
     "extra": {