From d4b36f78d0d0f85cc2896d1b837b8065a4eb575b Mon Sep 17 00:00:00 2001
From: Jaapio <jaap@ijaap.nl>
Date: Mon, 13 Dec 2021 20:00:52 +0100
Subject: [PATCH] Move to composer based psalm

---
 .github/workflows/push.yml | 2 +-
 Makefile                   | 2 +-
 composer.json              | 3 ++-
 phive.xml                  | 6 ------
 psalm.xml                  | 5 +++++
 5 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 phive.xml

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 2ca5441..38013d0 100644
--- 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
index c185d9a..0cd7a08 100644
--- 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
index 56e8cc9..a0ea712 100644
--- 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
deleted file mode 100644
index 078a08d..0000000
--- a/phive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phive xmlns="https://phar.io/phive">
-  <phar name="php-coveralls/php-coveralls" version="^2.2.0" installed="2.2.0" location="./tools/php-coveralls" copy="true"/>
-  <phar name="scrutinizer-ci/ocular" version="^1.6.0" installed="1.6.0" location="./tools/ocular" copy="true" force-accept-unsigned="true"/>
-  <phar name="psalm" version="^4.4.1" installed="4.4.1" location="./tools/psalm" copy="true"/>
-</phive>
diff --git a/psalm.xml b/psalm.xml
index 648b6d2..18636c6 100644
--- 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>