Skip to content

Commit 7ba4117

Browse files
authored
[php] Flight update to PHP 8.5 (#10312)
* [php] Flight update to PHP 8.5 * Fix deprecated constant
1 parent 95038a3 commit 7ba4117

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

frameworks/PHP/flight/flight-workerman.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.4/fpm/
10+
COPY deploy/conf/* /etc/php/8.5/fpm/
1111

1212
WORKDIR /flight
1313
COPY . .
@@ -16,8 +16,8 @@ ENV FLIGHT_DIR="/flight/src"
1616

1717
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1818

19-
RUN apt-get install -y php-pear php8.4-dev libevent-dev php8.4-xml > /dev/null
20-
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
19+
RUN apt-get install -y php-pear php8.5-dev libevent-dev php8.5-xml > /dev/null
20+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
2121

2222
RUN composer require joanhey/adapterman:^0.7
2323
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet

frameworks/PHP/flight/flight.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.4/fpm/
10+
COPY deploy/conf/* /etc/php/8.5/fpm/
1111

1212
WORKDIR /flight
1313
COPY --link . .
@@ -18,11 +18,11 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1818

1919
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
2020

21-
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;
21+
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;
2222

2323
RUN chmod -R 777 /flight
2424

2525
EXPOSE 8080
2626

27-
CMD service php8.4-fpm start && \
27+
CMD service php8.5-fpm start && \
2828
nginx -c /flight/deploy/nginx.conf

frameworks/PHP/flight/server.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ class HeaderDate
3737

3838
public static function init(): void
3939
{
40-
self::$date = self::NAME . gmdate(DATE_RFC7231);
40+
self::$date = self::NAME . gmdate('D, d M Y H:i:s \G\M\T');
4141
Timer::add(1, static function () {
42-
self::$date = self::NAME . gmdate(DATE_RFC7231);
42+
self::$date = self::NAME . gmdate('D, d M Y H:i:s \G\M\T');
4343
});
4444
}
4545
}

0 commit comments

Comments
 (0)