Browse Source

[php] Slim update to PHP 8.5 (#10317)

Joan Miquel 3 weeks ago
parent
commit
76190d7038

+ 2 - 2
frameworks/PHP/slim/server.php

@@ -39,9 +39,9 @@ class HeaderDate
 
 
     public static function init(): void
     public static function init(): void
     {
     {
-        self::$date = self::NAME . gmdate(DATE_RFC7231);
+        self::$date = self::NAME . gmdate('D, d M Y H:i:s \G\M\T');
         Timer::add(1, static function() {
         Timer::add(1, static function() {
-            self::$date = self::NAME . gmdate(DATE_RFC7231);
+            self::$date = self::NAME . gmdate('D, d M Y H:i:s \G\M\T');
         });
         });
     }
     }
 }
 }

+ 4 - 4
frameworks/PHP/slim/slim-workerman-pgsql.dockerfile

@@ -8,14 +8,14 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
 RUN apt-get upgrade -yqq > /dev/null
 RUN apt-get upgrade -yqq > /dev/null
 
 
 RUN apt-get install -yqq git \
 RUN apt-get install -yqq git \
-    php8.4-cli php8.4-pgsql php8.4-mbstring php8.4-xml php8.4-curl > /dev/null
+    php8.5-cli php8.5-pgsql php8.5-mbstring php8.5-xml php8.5-curl > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.4-dev 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 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/conf/cli-php.ini /etc/php/8.4/cli/conf.d/20-adapterman.ini
+COPY deploy/conf/cli-php.ini /etc/php/8.5/cli/conf.d/20-adapterman.ini
 
 
 WORKDIR /slim
 WORKDIR /slim
 COPY --link . .
 COPY --link . .

+ 4 - 4
frameworks/PHP/slim/slim-workerman.dockerfile

@@ -7,14 +7,14 @@ 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
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 
 RUN apt-get update -yqq > /dev/null && apt-get install -yqq git \
 RUN apt-get update -yqq > /dev/null && apt-get install -yqq git \
-    php8.4-cli php8.4-mysql php8.4-mbstring php8.4-xml php8.4-curl > /dev/null
+    php8.5-cli php8.5-mysql php8.5-mbstring php8.5-xml php8.5-curl > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.4-dev 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 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/conf/cli-php.ini /etc/php/8.4/cli/conf.d/20-adapterman.ini
+COPY deploy/conf/cli-php.ini /etc/php/8.5/cli/conf.d/20-adapterman.ini
 
 
 WORKDIR /slim
 WORKDIR /slim
 COPY --link . .
 COPY --link . .

+ 4 - 4
frameworks/PHP/slim/slim.dockerfile

@@ -7,16 +7,16 @@ 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
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 
 RUN apt-get install -yqq nginx git unzip \
 RUN apt-get install -yqq nginx git unzip \
-    php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-xml php8.4-curl > /dev/null
+    php8.5 php8.5-common php8.5-cli php8.5-fpm php8.5-mysql php8.5-xml php8.5-curl > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 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/
 
 
 WORKDIR /slim
 WORKDIR /slim
 COPY --link . .
 COPY --link . .
 
 
-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 composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 
@@ -24,5 +24,5 @@ RUN chmod -R 777 /slim
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.4-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /slim/deploy/nginx.conf
     nginx -c /slim/deploy/nginx.conf