[php] Update plain PHP to 8.5 (#10304)

* [php] Update plain PHP to 8.5

* Fix php

* FrankenPHP force PHP 8.5

* Fix Frankenphp

frameworks/PHP/php/php-caddy.dockerfile

@@ -7,9 +7,9 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq
 
 RUN apt-get install -yqq git unzip curl \
-    php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql > /dev/null
+    php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql > /dev/null
 
-COPY deploy/conf/* /etc/php/8.4/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 # Install Caddyserver
 RUN apt-get install -y debian-keyring debian-archive-keyring apt-transport-https > /dev/null \
@@ -20,11 +20,11 @@ RUN apt-get install -y debian-keyring debian-archive-keyring apt-transport-https
 ADD ./ /php
 WORKDIR /php
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 RUN chmod -R 777 /php
 
 EXPOSE 8080
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     caddy run --config deploy/caddy/Caddyfile

frameworks/PHP/php/php-eloquent.dockerfile

@@ -6,16 +6,16 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip  \
-    php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-curl > /dev/null
+    php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql php8.5-mbstring php8.5-curl > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.4/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 ADD ./ /php
 WORKDIR /php
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 COPY deploy/eloquent/composer* ./
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
@@ -24,5 +24,5 @@ RUN chmod -R 777 /php
 
 EXPOSE 8080
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

frameworks/PHP/php/php-franken.dockerfile

@@ -1,10 +1,9 @@
-FROM dunglas/frankenphp
+FROM dunglas/frankenphp:php8.5
 
 # add additional extensions here:
 RUN install-php-extensions \
     pdo_mysql \
-    zip \
-    opcache > /dev/null
+    zip > /dev/null
 
 
 COPY --link deploy/franken/Caddyfile /etc/frankenphp/Caddyfile

frameworks/PHP/php/php-h2o.dockerfile

@@ -41,7 +41,7 @@ RUN apt-get install \
 
 FROM "ubuntu:${UBUNTU_VERSION}"
 
-ARG PHP_VERSION=8.4
+ARG PHP_VERSION=8.5
 
 ENV TZ=America/Los_Angeles
 
@@ -75,5 +75,5 @@ ARG TFB_TEST_DATABASE
 ARG TFB_TEST_NAME
 
 CMD sed -i "s/num-threads: x/num-threads: $((2 * $(nproc)))/g" /opt/h2o/etc/h2o.conf && \
-    service php8.4-fpm start && \
+    service php8.5-fpm start && \
     /opt/h2o/bin/h2o -c /opt/h2o/etc/h2o.conf

frameworks/PHP/php/php-laravel-query-builder.dockerfile

@@ -5,16 +5,16 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-dev > /dev/null
+    apt-get install -yqq nginx git unzip php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql php8.5-mbstring php8.5-dev > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.4/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 ADD ./ /php
 WORKDIR /php
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 COPY deploy/eloquent/composer* ./
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
@@ -23,5 +23,5 @@ RUN chmod -R 777 /php
 
 EXPOSE 8080
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

frameworks/PHP/php/php-pgsql-raw.dockerfile

@@ -5,9 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-pgsql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-pgsql  > /dev/null
 
-COPY deploy/conf/* /etc/php/8.4/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 ADD ./ /php
 WORKDIR /php
@@ -17,11 +17,11 @@ RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" dbquery.php
 RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" fortune.php
 RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" updateraw.php
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 RUN chmod -R 777 /php
 
 EXPOSE 8080
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

frameworks/PHP/php/php-pools.dockerfile

@@ -5,19 +5,19 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql  > /dev/null
 
-COPY deploy/conf/* /etc/php/8.4/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 ADD ./ /php
 WORKDIR /php
 
-COPY deploy/conf/php-fpm-pools.conf /etc/php/8.4/fpm/php-fpm.conf
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 512|pm.max_children = 256|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
+COPY deploy/conf/php-fpm-pools.conf /etc/php/8.5/fpm/php-fpm.conf
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 512|pm.max_children = 256|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 RUN chmod -R 777 /php
 
 EXPOSE 8080
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /php/deploy/nginx-pools.conf -g "daemon off;"

frameworks/PHP/php/php-raw7-tcp.dockerfile

@@ -5,21 +5,21 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql  > /dev/null
 
-COPY deploy/conf/* /etc/php/8.4/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 ADD ./ /php
 WORKDIR /php
 
-RUN sed -i "s|listen = /run/php/php-fpm.sock|listen = 127.0.0.1:9001|g" /etc/php/8.4/fpm/php-fpm.conf
+RUN sed -i "s|listen = /run/php/php-fpm.sock|listen = 127.0.0.1:9001|g" /etc/php/8.5/fpm/php-fpm.conf
 RUN sed -i "s|server unix:/var/run/php/php-fpm.sock;|server 127.0.0.1:9001;|g" deploy/nginx7.conf
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 RUN chmod -R 777 /php
 
 EXPOSE 8080
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

frameworks/PHP/php/php-workerman.dockerfile

@@ -7,12 +7,12 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq
 
 RUN apt-get install -yqq git unzip \
-    php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql  > /dev/null
+    php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql  > /dev/null
 
-RUN apt-get install -y php-pear php8.4-dev php8.4-xml libevent-dev > /dev/null
-RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.5-dev php8.5-xml libevent-dev > /dev/null
+RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
 
-COPY deploy/workerman/cli-php.ini  /etc/php/8.4/cli/conf.d/20-adapterman.ini
+COPY deploy/workerman/cli-php.ini  /etc/php/8.5/cli/conf.d/20-adapterman.ini
 
 COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
 

frameworks/PHP/php/php.dockerfile

@@ -6,19 +6,18 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq
 RUN apt-get install -yqq nginx git unzip \
-    php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql  > /dev/null
+    php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql  > /dev/null
 
-COPY deploy/conf/* /etc/php/8.4/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 ADD ./ /php
 WORKDIR /php
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
-RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.4/fpm/conf.d/10-opcache.ini
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 RUN chmod -R 777 /php
 
 EXPOSE 8080
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"