Move to composer based psalm

phpDocumentor · Dec 13, 2021 · d4b36f7 · d4b36f7
1 parent b39b1fc
commit d4b36f7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -172,4 +172,4 @@ jobs:
           composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Psalm
-        run: psalm --output-format=github
+        run: vendor/bin/psalm.phar --output-format=github
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ phpstan:
 
 .PHONY: psalm
 psalm:
-	docker run -it --rm -v${CURDIR}:/data -w /data php:7.3 ./tools/psalm
+	docker run -it --rm -v${CURDIR}:/data -w /data php:7.3 vendor/bin/psalm.phar
 
 .PHONY: test
 test:

diff --git a/composer.json b/composer.json
@@ -28,7 +28,8 @@
         "phpunit/phpunit": "^8.2 || ^9.2",
         "mockery/mockery": "^1.2",
         "phpstan/phpstan": "^0.12",
-        "ext-simplexml": "*"
+        "ext-simplexml": "*",
+        "psalm/phar": "^4.15"
     },
     "extra": {
         "branch-alias": {

diff --git a/phive.xml b/phive.xml
diff --git a/psalm.xml b/psalm.xml
@@ -17,5 +17,10 @@
         <LessSpecificReturnType errorLevel="info" />
 
         <MissingDependency errorLevel="info" />
+        <MixedArgumentTypeCoercion>
+            <errorLevel type="suppress">
+                <file name="src/phpDocumentor/GraphViz/Graph.php" />
+            </errorLevel>
+        </MixedArgumentTypeCoercion>
     </issueHandlers>
 </psalm>