Merge pull request #9531 from joanhey/leaf-php8.4

[php] Leaf update to PHP/8.4
TechEmpower · Jan 16, 2025 · ed0bbf4 · ed0bbf4
2 parents 4f7f619 + 90837f3
commit ed0bbf4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/frameworks/PHP/leaf/deploy/conf/cli-php.ini b/frameworks/PHP/leaf/deploy/conf/cli-php.ini
@@ -13,4 +13,4 @@ memory_limit = 512M
 opcache.jit_buffer_size = 128M
 opcache.jit = tracing
 
-disable_functions=header,header_remove,headers_sent,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,set_time_limit
+disable_functions=header,header_remove,headers_sent,headers_list,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,session_unset,session_get_cookie_params,session_set_cookie_params,set_time_limit
diff --git a/frameworks/PHP/leaf/leaf-workerman.dockerfile b/frameworks/PHP/leaf/leaf-workerman.dockerfile
@@ -7,23 +7,23 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get update -yqq > /dev/null && apt-get install -yqq git \
-    php8.3-cli php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl php8.3-zip > /dev/null
+    php8.4-cli php8.4-mysql php8.4-mbstring php8.4-xml php8.4-curl php8.4-zip > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y libevent-dev php8.3-dev > /dev/null \
+RUN apt-get install -y libevent-dev php8.4-dev > /dev/null \
     && pecl install event-3.1.4 > /dev/null \
-    && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
+    && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
 
-COPY --link deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
+COPY --link deploy/conf/cli-php.ini /etc/php/8.4/cli/php.ini
 
 WORKDIR /leaf
 COPY --link . .
 
 EXPOSE 8080
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-RUN composer require joanhey/adapterman:^0.6 --quiet
+RUN composer require joanhey/adapterman:^0.7 --quiet
 
 
 RUN sed -i 's|app()->run(); //| //$app->run(); //|g' index.php

diff --git a/frameworks/PHP/leaf/leaf.dockerfile b/frameworks/PHP/leaf/leaf.dockerfile
@@ -7,22 +7,22 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl php8.3-zip > /dev/null
+    php8.4-cli php8.4-fpm php8.4-mysql php8.4-xml php8.4-curl php8.4-zip > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY --link deploy/conf/* /etc/php/8.3/fpm/
+COPY --link deploy/conf/* /etc/php/8.4/fpm/
 
 WORKDIR /leaf
 COPY --link . .
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/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.4/fpm/php-fpm.conf ; fi;
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 RUN chmod -R 777 /leaf
 
 EXPOSE 8080
 
-CMD service php8.3-fpm start && \
+CMD service php8.4-fpm start && \
     nginx -c /leaf/deploy/nginx.conf