From 645f515e295c4a7b505c44bc9622d6b158a7b526 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:01:40 +0000
Subject: [PATCH] Restore PHP 8.3 (#2422)

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
---
 30/apache/Dockerfile     |  2 +-
 30/fpm-alpine/Dockerfile |  2 +-
 30/fpm/Dockerfile        |  2 +-
 31/apache/Dockerfile     |  2 +-
 31/fpm-alpine/Dockerfile |  2 +-
 31/fpm/Dockerfile        |  2 +-
 update.sh                |  3 ++-
 versions.json            | 12 ++++++------
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 7b3f2939..31d62217 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-apache-bookworm
+FROM php:8.3-apache-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index 26c5c856..09e10d33 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.21
+FROM php:8.3-fpm-alpine3.21
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index 6ef1a6a7..8cbb07d3 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-fpm-bookworm
+FROM php:8.3-fpm-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile
index 642be03e..6421c7b0 100644
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-apache-bookworm
+FROM php:8.3-apache-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile
index 0c9ff741..a20a12e8 100644
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.21
+FROM php:8.3-fpm-alpine3.21
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile
index 9eee6cfc..92f3935c 100644
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-fpm-bookworm
+FROM php:8.3-fpm-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/update.sh b/update.sh
index de9670b3..3128e4a3 100755
--- a/update.sh
+++ b/update.sh
@@ -10,7 +10,8 @@ declare -A debian_version=(
 )
 
 declare -A php_version=(
-	[default]='8.2'
+	[29]='8.2'
+	[default]='8.3'
 )
 
 declare -A cmd=(
diff --git a/versions.json b/versions.json
index 2bfbfa63..daac9da6 100644
--- a/versions.json
+++ b/versions.json
@@ -9,19 +9,19 @@
         "variant": "apache",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm-alpine": {
         "variant": "fpm-alpine",
         "base": "alpine",
         "baseVersion": "3.21",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       }
     }
   },
@@ -35,19 +35,19 @@
         "variant": "apache",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm-alpine": {
         "variant": "fpm-alpine",
         "base": "alpine",
         "baseVersion": "3.21",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       }
     }
   },
-- 
GitLab