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 @@ - - - + + + +