From b02061878fecae084aee41e452a2f1bfe001be6f Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Fri, 13 Jan 2023 23:28:18 +0100
Subject: [PATCH] Update test runners: no longer support PHP7.1, add PHP8.2

---
 docker-compose.yml                     |  7 +------
 run-tests-for-all-php-versions.sh      |  4 ++--
 utilities/testrunners/php71/Dockerfile | 10 ----------
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 utilities/testrunners/php71/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 4f940b2c..799cdfb8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,15 +3,10 @@ services:
   base:
     build:
       context: .
-      dockerfile: ./utilities/testrunners/php71/Dockerfile
+      dockerfile: ./utilities/testrunners/php72/Dockerfile
     volumes:
       - .:/app
     working_dir: /app
-  php71:
-    extends:
-      service: base
-    build:
-      dockerfile: ./utilities/testrunners/php71/Dockerfile
   php72:
     extends:
       service: base
diff --git a/run-tests-for-all-php-versions.sh b/run-tests-for-all-php-versions.sh
index b64f01e4..1f1b94c2 100755
--- a/run-tests-for-all-php-versions.sh
+++ b/run-tests-for-all-php-versions.sh
@@ -5,9 +5,9 @@
 # - ./run-tests-for-all-php-versions.sh --group 20221124
 # - ./run-tests-for-all-php-versions.sh --exclude-group slow
 
-docker-compose run php71 ./run-tests.sh $@ && \
 docker-compose run php72 ./run-tests.sh $@ && \
 docker-compose run php73 ./run-tests.sh $@ && \
 docker-compose run php74 ./run-tests.sh $@ && \
 docker-compose run php80 ./run-tests.sh $@ && \
-docker-compose run php81 ./run-tests.sh $@
+docker-compose run php81 ./run-tests.sh $@ && \
+docker-compose run php82 ./run-tests.sh $@
diff --git a/utilities/testrunners/php71/Dockerfile b/utilities/testrunners/php71/Dockerfile
deleted file mode 100644
index 2ae6c1ae..00000000
--- a/utilities/testrunners/php71/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM php:7.1-cli
-
-## Basic utilities
-RUN apt-get update -yqq && apt-get install -y curl apt-utils git zip unzip
-
-## Composer
-COPY ./utilities/testrunners/shared/install-composer.sh /root/install-composer.sh
-WORKDIR /root
-RUN sh ./install-composer.sh
-RUN mv ./composer.phar /usr/local/bin/composer