From ed3ae04b8b8f9189b75fbcf98b48dc5a9fb51548 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Tue, 10 Dec 2024 01:01:12 +0100
Subject: [PATCH] bump php 8.4

---
 Dockerfile           | 4 ++--
 docker-entrypoint.sh | 4 ++--
 etc/testing-php.ini  | 4 ++--
 etc/unstable-php.ini | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8dd3cb6..59c19c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,8 +54,8 @@ COPY etc/snippets_common.conf /etc/nginx/snippets/snippets_common.conf
 RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.12/community/ gnu-libiconv=1.15-r2
 ENV LD_PRELOAD=/usr/lib/preloadable_libiconv.so
 
-# Use PHP 8.3 release
-ENV VER_PHP=php83
+# Use PHP 8.4 release
+ENV VER_PHP=php84
 
 # Install PHP required packages
 RUN apk add --no-cache --update \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ed58d3e..862cda1 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -88,11 +88,11 @@ VERSION_INSTALLED=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" relea
 echo >&2 "| Summary: "
 echo >&2 "| Alpine $(cat /etc/alpine-release)"
 echo >&2 "| Nginx $(nginx -v 2>&1 | sed 's/nginx version: nginx\///')"
-echo >&2 "| PHP $(php -r "echo PHP_VERSION;")"
+echo >&2 "| PHP $(php84 -r "echo PHP_VERSION;")"
 echo >&2 "| Dotclear ${VERSION_INSTALLED}"
 
 # Start web server
-php-fpm83 -D # FPM must start first in daemon mode
+php-fpm84 -D # FPM must start first in daemon mode
 nginx # Then nginx in no daemon mode
 
 exec "$@"
\ No newline at end of file
diff --git a/etc/testing-php.ini b/etc/testing-php.ini
index 2c917b4..1e30f1b 100644
--- a/etc/testing-php.ini
+++ b/etc/testing-php.ini
@@ -104,9 +104,9 @@ session.referer_check =
 session.cache_limiter = nocache
 session.cache_expire = 180
 session.use_trans_sid = 0
-session.sid_length = 26
+#session.sid_length = 26
 session.trans_sid_tags = "a=href,area=href,frame=src,form="
-session.sid_bits_per_character = 5
+#session.sid_bits_per_character = 5
 
 [opcache]
 opcache.enable=1
diff --git a/etc/unstable-php.ini b/etc/unstable-php.ini
index 980c2dd..f85f3a7 100644
--- a/etc/unstable-php.ini
+++ b/etc/unstable-php.ini
@@ -104,9 +104,9 @@ session.referer_check =
 session.cache_limiter = nocache
 session.cache_expire = 180
 session.use_trans_sid = 0
-session.sid_length = 26
+#session.sid_length = 26
 session.trans_sid_tags = "a=href,area=href,frame=src,form="
-session.sid_bits_per_character = 5
+#session.sid_bits_per_character = 5
 
 [opcache]
 opcache.enable=1