Browse Source

Merge pull request #9503 from joanhey/kumbia-php8.4

[php] Update plain PHP-Workerman to PHP8.4
Mike Smith 7 months ago
parent
commit
3ac2a20efa

+ 1 - 1
frameworks/PHP/php/deploy/workerman/cli-php.ini

@@ -13,4 +13,4 @@ memory_limit = 512M
 opcache.jit_buffer_size=128M
 opcache.jit_buffer_size=128M
 opcache.jit=tracing
 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

+ 2 - 2
frameworks/PHP/php/deploy/workerman/composer.json

@@ -1,5 +1,5 @@
 {
 {
   "require": {
   "require": {
-    "joanhey/adapterman": "^0.6"
+    "joanhey/adapterman": "^0.7"
   }
   }
-}
+}

+ 8 - 8
frameworks/PHP/php/php-workerman.dockerfile

@@ -1,26 +1,26 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 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 > /dev/null && \
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
-    apt-get update -yqq > /dev/null && apt-get upgrade -yqq 
+    apt-get update -yqq > /dev/null && apt-get upgrade -yqq
 
 
 RUN apt-get install -yqq git unzip \
 RUN apt-get install -yqq git unzip \
-    php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql  > /dev/null
+    php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql  > /dev/null
 
 
-RUN apt-get install -y php-pear php8.3-dev php8.3-xml libevent-dev > /dev/null
-RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
+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
 
 
-COPY deploy/workerman/cli-php.ini /etc/php/8.3/cli/php.ini
+COPY deploy/workerman/cli-php.ini /etc/php/8.4/cli/php.ini
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-ADD ./ /php
 WORKDIR /php
 WORKDIR /php
+COPY --link . .
 
 
 COPY deploy/workerman/composer.json ./
 COPY deploy/workerman/composer.json ./
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev 
+RUN composer install --optimize-autoloader --classmap-authoritative --no-dev
 
 
 COPY deploy/workerman/start.php ./
 COPY deploy/workerman/start.php ./