From eee9c118af87f4c01e74ba625c068fca6f3dd22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=A0?= <filip.stamcar@hotmail.com>
Date: Mon, 3 Aug 2020 21:48:23 +0200
Subject: [PATCH] Install PHPStan with phive.xml

---
 Dockerfile             | 15 ++-------------
 dependencies/phive.xml |  7 ++++---
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cd7db4d7..2e76904f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -110,8 +110,8 @@ RUN wget -O phive.phar https://phar.io/releases/phive.phar \
     && chmod +x phive.phar \
     && mv phive.phar /usr/local/bin/phive \
     && rm phive.phar.asc \
-    && phive install --trust-gpg-keys 31C7E470E2138192,8A03EA3B385DBAA1
-# Trusted GPG keys for PHP linters:   phpcs,           psalm
+    && phive install --trust-gpg-keys 31C7E470E2138192,CF1A108D0E7AE720,8A03EA3B385DBAA1
+# Trusted GPG keys for PHP linters:   phpcs,           phpstan,         psalm
 
 #########################################
 # Install Powershell + PSScriptAnalyzer #
@@ -218,17 +218,6 @@ RUN wget https://github.com/cvega/luarocks/archive/v3.3.1-super-linter.tar.gz -O
 
 RUN luarocks install luacheck
 
-#############################
-# Install Phive and PHPStan #
-#############################
-RUN wget -O phive.phar https://phar.io/releases/phive.phar \
-    && wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
-    && gpg --keyserver pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79 \
-    && gpg --verify phive.phar.asc phive.phar \
-    && chmod +x phive.phar \
-    && mv phive.phar /usr/local/bin/phive \
-    && yes | phive install -g phpstan
-
 ###########################################
 # Load GitHub Env Vars for GitHub Actions #
 ###########################################
diff --git a/dependencies/phive.xml b/dependencies/phive.xml
index af2d5187..8d1b31d4 100755
--- a/dependencies/phive.xml
+++ b/dependencies/phive.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-    <!-- When adding new linter, do not forget to add its GPG key ID to Dockerfile -->
-    <phar name="phpcs" version="^3.5" installed="3.5.5" location="/usr/local/bin/phpcs" copy="true"/>
-    <phar name="psalm" version="^3.12" installed="3.12.2" location="/usr/local/bin/psalm" copy="true"/>
+  <!-- When adding new linter, do not forget to add its GPG key ID to Dockerfile -->
+  <phar name="phpcs" version="^3.5" installed="3.5.5" location="/usr/local/bin/phpcs" copy="true"/>
+  <phar name="phpstan" version="^0.12" installed="0.12.34" location="/usr/local/bin/phpstan" copy="true"/>
+  <phar name="psalm" version="^3.12" installed="3.12.2" location="/usr/local/bin/psalm" copy="true"/>
 </phive>