From 13f6ec2ffb8437b7670ae6c46f1ece7104c9a0aa Mon Sep 17 00:00:00 2001
From: Marco Ferrari <ferrari.marco@gmail.com>
Date: Mon, 27 May 2024 14:25:57 +0200
Subject: [PATCH] build: update php linters (#5689)

- Composer to 2.7.6
- PHPCS to 3.10.1
- PHPStan to 1.11.2
- Psalm to 5.24.0
---
 dependencies/phive.xml   | 8 ++++----
 scripts/install-phive.sh | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dependencies/phive.xml b/dependencies/phive.xml
index e14a013d..10407c6d 100644
--- a/dependencies/phive.xml
+++ b/dependencies/phive.xml
@@ -1,8 +1,8 @@
 <?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="composer" version="^2.6.6" installed="2.6.6" location="./usr/bin/composer" copy="false"/>
-  <phar name="phpcs" version="^3.8.0" installed="3.8.0" location="/usr/local/bin/phpcs" copy="true"/>
-  <phar name="phpstan" version="^1.10.48" installed="1.10.48" location="/usr/local/bin/phpstan" copy="true"/>
-  <phar name="psalm" version="^5.17.0" installed="4.18.1" location="./usr/local/bin/psalm" copy="true"/>
+  <phar name="composer" version="^2.7.6" installed="2.7.6" location="./usr/bin/composer" copy="false"/>
+  <phar name="phpcs" version="^3.10.1" installed="3.10.1" location="/usr/local/bin/phpcs" copy="true"/>
+  <phar name="phpstan" version="^1.11.2" installed="1.11.2" location="/usr/local/bin/phpstan" copy="true"/>
+  <phar name="psalm" version="^5.24.0" installed="5.24.0" location="./usr/local/bin/psalm" copy="true"/>
 </phive>
diff --git a/scripts/install-phive.sh b/scripts/install-phive.sh
index d7db77ed..20013cfd 100755
--- a/scripts/install-phive.sh
+++ b/scripts/install-phive.sh
@@ -8,7 +8,7 @@ apk add --no-cache --virtual .php-build-deps \
 # Install phive
 curl --retry 5 --retry-delay 5 -sLO https://phar.io/releases/phive.phar
 curl --retry 5 --retry-delay 5 -sLO https://phar.io/releases/phive.phar.asc
-gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "0x9D8A98B29B2D5D79"
+gpg --keyserver hkps://keys.openpgp.org --recv-keys "0x9D8A98B29B2D5D79"
 gpg --verify phive.phar.asc phive.phar
 chmod +x phive.phar
 mv phive.phar /usr/local/bin/phive
@@ -16,7 +16,7 @@ rm phive.phar.asc
 
 # Install the PHARs listed in phive.xml
 phive --no-progress install \
-  --trust-gpg-keys 31C7E470E2138192,CF1A108D0E7AE720,8A03EA3B385DBAA1,12CE0F1D262429A5,5E6DDE998AB73B8E,51C67305FFC2E5C0,CBB3D576F2A0946F \
+  --trust-gpg-keys 31C7E470E2138192,CF1A108D0E7AE720,8A03EA3B385DBAA1,12CE0F1D262429A5,5E6DDE998AB73B8E,51C67305FFC2E5C0,CBB3D576F2A0946F,689DAD778FF08760E046228BA978220305CD5C32 \
   --target /usr/bin
 
 apk del --no-network --purge .php-build-deps