From 667be01cc2165b9e94b98f6542919c15afbfc02e Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Mon, 23 Oct 2023 22:37:56 +0200
Subject: [PATCH] Fixes

---
 Dockerfile          |  2 +-
 bugs/1_infection.sh |  3 +--
 bugs/2_psalm.sh     |  4 ++++
 bugs/3_psalm_new.sh | 10 +++++++---
 run.sh              |  3 ++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 576f9ee..546ea19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ RUN true \
 		systemtap-sdt-dev libssl-dev \
 		libpcre2-dev libargon2-dev libedit-dev libsodium-dev llvm-16 libonig-dev \
     \
-    && git clone --depth 1 https://github.com/php/php-src && cd php-src \
+    && git clone --depth 1 https://github.com/php/php-src -b PHP-8.1 && cd php-src \
     \
     && ./buildconf \
 	&& ./configure --prefix=/usr \
diff --git a/bugs/1_infection.sh b/bugs/1_infection.sh
index 30d6c38..45279a5 100755
--- a/bugs/1_infection.sh
+++ b/bugs/1_infection.sh
@@ -8,9 +8,8 @@ cd /tmp
 
 rm -rf infection
 
-git clone https://github.com/infection/infection
+git clone https://github.com/infection/infection -b 0.27.4
 cd infection
-git checkout fe7cbe78e5838608df42ec7688d353ef1d631fee
 
 composer i --ignore-platform-reqs
 
diff --git a/bugs/2_psalm.sh b/bugs/2_psalm.sh
index 8525d96..affe0c9 100755
--- a/bugs/2_psalm.sh
+++ b/bugs/2_psalm.sh
@@ -8,6 +8,10 @@ git clone https://github.com/vimeo/psalm
 cd psalm
 git checkout 7428e49b115a2a837aa29cf0fafd0ca902fe2457
 
+git branch -D master || true
+git branch master
+git checkout master
+
 export PSALM_ALLOW_XDEBUG=1
 
 composer i --ignore-platform-reqs
diff --git a/bugs/3_psalm_new.sh b/bugs/3_psalm_new.sh
index ce3a9d1..6ee5c8f 100755
--- a/bugs/3_psalm_new.sh
+++ b/bugs/3_psalm_new.sh
@@ -2,12 +2,16 @@
 
 cd /tmp
 
-rm -rf psalm
+rm -rf psalm_3
 
-git clone https://github.com/nicelocal/psalm -b rector_pass --depth 1
-cd psalm
+git clone https://github.com/nicelocal/psalm -b rector_pass --depth 1 psalm_3
+cd psalm_3
 git checkout 9d3fee47afa90f3eb53043a26f01e587d2dd34e5
 
+git branch -D master || true
+git branch master
+git checkout master
+
 export PSALM_ALLOW_XDEBUG=1
 
 composer i --ignore-platform-reqs
diff --git a/run.sh b/run.sh
index 0f10de9..0f9650f 100755
--- a/run.sh
+++ b/run.sh
@@ -3,5 +3,6 @@
 docker build . -t asan_tests
 
 for f in bugs/*sh; do
-    $f || echo "!!! $f failed !!!"
+    echo "!!! About to run $f !!!"
+    $f || echo "!!! Failed to run $f !!!"
 done
\ No newline at end of file