From 85bd3399e326235efa055430051777619f31ee3b Mon Sep 17 00:00:00 2001
From: Frank van Hest <frank@frankvanhest.nl>
Date: Fri, 26 Jan 2024 14:12:05 +0100
Subject: [PATCH] Added support for PHP 8.3 and dropped support for PHP 8.0

---
 .github/workflows/tests.yml                        |  2 +-
 composer.json                                      |  6 +++---
 docker-compose.yml                                 | 14 +++++++-------
 docker/{php80 => php83}/Dockerfile                 |  2 +-
 docker/{php80 => php83}/conf.d/error_reporting.ini |  0
 docker/{php80 => php83}/conf.d/xdebug.ini          |  0
 run-tests.sh                                       |  8 ++++----
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename docker/{php80 => php83}/Dockerfile (94%)
 rename docker/{php80 => php83}/conf.d/error_reporting.ini (100%)
 rename docker/{php80 => php83}/conf.d/xdebug.ini (100%)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f06310c..cfccc86 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1, 8.2]
+        php: [8.1, 8.2, 8.3]
         composer-flags: [ '' ]
         stability: ['prefer-lowest', 'prefer-stable']
         experimental: [false]
diff --git a/composer.json b/composer.json
index 9372b16..78b28de 100644
--- a/composer.json
+++ b/composer.json
@@ -10,12 +10,12 @@
         }
     ],
     "require": {
-        "php": "~8.0.0 | ~8.1.0 | ~8.2.0",
+        "php": "~8.1.0 | ~8.2.0 | ~8.3.0",
         "nikic/php-parser": "^v4.15",
-        "phpstan/phpstan": "^1.9"
+        "phpstan/phpstan": "^1.10"
     },
     "require-dev": {
-        "infection/infection": "^0.26",
+        "infection/infection": "^0.27",
         "phpunit/phpunit": "^9.5.5",
         "roave/security-advisories": "dev-latest"
     },
diff --git a/docker-compose.yml b/docker-compose.yml
index 4207113..1d8933f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,5 @@
 version: "3.7"
 services:
-  php80:
-    build: ./docker/php80/
-    volumes:
-      - .:/var/www/html
-      - ./docker/php80/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-      - ./docker/php80/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini
-
   php81:
     build: ./docker/php81/
     volumes:
@@ -20,3 +13,10 @@ services:
       - .:/var/www/html
       - ./docker/php82/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
       - ./docker/php82/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini
+
+  php83:
+    build: ./docker/php83/
+    volumes:
+      - .:/var/www/html
+      - ./docker/php83/conf.d/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+      - ./docker/php83/conf.d/error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini
diff --git a/docker/php80/Dockerfile b/docker/php83/Dockerfile
similarity index 94%
rename from docker/php80/Dockerfile
rename to docker/php83/Dockerfile
index 18852f2..6aed288 100644
--- a/docker/php80/Dockerfile
+++ b/docker/php83/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.3-cli
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends git libzip-dev zip unzip \
diff --git a/docker/php80/conf.d/error_reporting.ini b/docker/php83/conf.d/error_reporting.ini
similarity index 100%
rename from docker/php80/conf.d/error_reporting.ini
rename to docker/php83/conf.d/error_reporting.ini
diff --git a/docker/php80/conf.d/xdebug.ini b/docker/php83/conf.d/xdebug.ini
similarity index 100%
rename from docker/php80/conf.d/xdebug.ini
rename to docker/php83/conf.d/xdebug.ini
diff --git a/run-tests.sh b/run-tests.sh
index 18a0d5a..fa4a6f5 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 
-echo 'RUN tests in PHP 8.0'
-/usr/bin/env docker-compose run php80 /var/www/html/docker/run-tests.sh
-
 echo 'RUN tests in PHP 8.1'
 /usr/bin/env docker-compose run php81 /var/www/html/docker/run-tests.sh
 
 echo 'RUN tests in PHP 8.2'
-/usr/bin/env docker-compose run php81 /var/www/html/docker/run-tests.sh
+/usr/bin/env docker-compose run php82 /var/www/html/docker/run-tests.sh
+
+echo 'RUN tests in PHP 8.3'
+/usr/bin/env docker-compose run php83 /var/www/html/docker/run-tests.sh