From 07031decd7ff51978cfaeb570f6304ed791b129f Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Thu, 30 Nov 2023 19:38:26 +0100
Subject: [PATCH] Account for shared workspace

---
 tests/setup.sh |  9 ---------
 tests/test.sh  | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/tests/setup.sh b/tests/setup.sh
index 7d8823243..47cc363d1 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -4,13 +4,4 @@ set -ex
 
 export COMPOSER_PROCESS_TIMEOUT=100000
 
-apk add procps git unzip github-cli openssh
-
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-php composer-setup.php
-php -r "unlink('composer-setup.php');"
-mv composer.phar /usr/local/bin/composer
-
-php tests/jit.php
-
 composer update
diff --git a/tests/test.sh b/tests/test.sh
index f844691c7..d2acb9d2f 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -4,6 +4,19 @@ set -ex
 
 export COMPOSER_PROCESS_TIMEOUT=100000
 
+apk add procps git unzip github-cli openssh
+
+cd /tmp
+
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+php composer-setup.php
+php -r "unlink('composer-setup.php');"
+mv composer.phar /usr/local/bin/composer
+
+cd $OLDPWD
+
+php tests/jit.php
+
 php tests/lock_setup.php
 
 if [ "$1" == "cs" ]; then
@@ -25,6 +38,12 @@ if [ "$1" == "cs" ]; then
     exit 0
 fi
 
+if [ "$1" == "psalm" ]; then
+    composer psalm
+    exit 0
+fi
+
+
 if [ "$1" == "handshake" ]; then
     php tests/handshake.php
     exit 0