Fix: Install vimeo/psalm with phive

ergebnis · Nov 28, 2021 · 5bbb93f · 5bbb93f
1 parent f9ffaa3
commit 5bbb93f
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 738 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -254,7 +254,7 @@ jobs:
         run: "mkdir -p .build/psalm"
 
       - name: "Run vimeo/psalm"
-        run: "vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4"
+        run: ".phive/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4"
 
   tests:
     name: "Tests"

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="composer-require-checker" version="^3.5.1" installed="3.5.1" location="./.phive/composer-require-checker" copy="true"/>
+  <phar name="psalm" version="4.4.1" installed="4.4.1" location="./.phive/psalm" copy="true"/>
 </phive>
diff --git a/.phive/psalm b/.phive/psalm
diff --git a/Makefile b/Makefile
@@ -29,14 +29,14 @@ mutation-tests: vendor ## Runs mutation tests with infection/infection
 .PHONY: static-code-analysis
 static-code-analysis: vendor ## Runs a static code analysis with vimeo/psalm
 	mkdir -p .build/psalm
-	vendor/bin/psalm --config=psalm.xml --clear-cache
-	vendor/bin/psalm --config=psalm.xml --diff --show-info=false --stats --threads=4
+	.phive/psalm --config=psalm.xml --clear-cache
+	.phive/psalm --config=psalm.xml --diff --show-info=false --stats --threads=4
 
 .PHONY: static-code-analysis-baseline
 static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with vimeo/psalm
 	mkdir -p .build/psalm
-	vendor/bin/psalm --config=psalm.xml --clear-cache
-	vendor/bin/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml
+	.phive/psalm --config=psalm.xml --clear-cache
+	.phive/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml
 
 .PHONY: tests
 tests: vendor ## Runs auto-review, unit, integration, and example tests with phpunit/phpunit

diff --git a/composer.json b/composer.json
@@ -26,9 +26,7 @@
     "ergebnis/license": "^1.1.0",
     "ergebnis/php-cs-fixer-config": "~2.12.1",
     "ergebnis/test-util": "^1.4.0",
-    "infection/infection": "~0.21.0",
-    "psalm/plugin-phpunit": "~0.15.1",
-    "vimeo/psalm": "^4.4.1"
+    "infection/infection": "~0.21.0"
   },
   "config": {
     "platform": {