From ea41caded6db99a75e76ab008ef578e3ddd9a2e4 Mon Sep 17 00:00:00 2001
From: William Correa <wilcorrea@gmail.com>
Date: Fri, 23 Oct 2026 08:32:20 -0300
Subject: [PATCH] fix(php): Update runtime to PHP 8.3.36

---
 php-hyperf/8.3/Dockerfile      | 75 +++++++++++++++++++++-------------
 php-hyperf/8.3/README-pt-BR.md |  2 +
 php-hyperf/8.3/README.md       |  2 +
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/php-hyperf/8.3/Dockerfile b/php-hyperf/8.3/Dockerfile
index 51c9d14..ec6b091 100644
--- a/php-hyperf/8.3/Dockerfile
+++ b/php-hyperf/8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20 AS hyperf
+FROM alpine:3.21 AS hyperf
 
 ARG CONTEXT
 ARG TIMEZONE
@@ -18,41 +18,60 @@ RUN apk update && \
 SHELL ["/bin/ash", "-o", "pipefail", "-c"]
 
 RUN apk add --no-cache \
-        php83-bcmath=8.3.15-r0 \
-        php83-ctype=8.3.15-r0 \
-        php83-curl=8.3.15-r0 \
-        php83-dom=8.3.15-r0 \
-        php83-fileinfo=8.3.15-r0 \
-        php83-fpm=8.3.15-r0 \
-        php83-gd=8.3.15-r0 \
-        php83-iconv=8.3.15-r0 \
-        php83-intl=8.3.15-r0 \
-        php83-mbstring=8.3.15-r0 \
-        php83-opcache=8.3.15-r0 \
-        php83-openssl=8.3.15-r0 \
-        php83-pcntl=8.3.15-r0 \
-        php83-pdo=8.3.15-r0 \
-        php83-pdo_mysql=8.3.15-r0 \
+        php83-bcmath=8.3.36-r0 \
+        php83-ctype=8.3.36-r0 \
+        php83-curl=8.3.36-r0 \
+        php83-dom=8.3.36-r0 \
+        php83-fileinfo=8.3.36-r0 \
+        php83-fpm=8.3.36-r0 \
+        php83-gd=8.3.36-r0 \
+        php83-iconv=8.3.36-r0 \
+        php83-intl=8.3.36-r0 \
+        php83-mbstring=8.3.36-r0 \
+        php83-opcache=8.3.36-r0 \
+        php83-openssl=8.3.36-r0 \
+        php83-pcntl=8.3.36-r0 \
+        php83-pdo=8.3.36-r0 \
+        php83-pdo_mysql=8.3.36-r0 \
         php83-pecl-decimal=1.5.0-r1 \
         php83-pecl-ds=1.5.0-r0 \
         php83-pecl-mcrypt=1.0.7-r0 \
-        php83-pecl-mongodb=1.19.1-r0 \
+        php83-pecl-mongodb=1.20.1-r0 \
         php83-pecl-rdkafka=6.0.5-r0 \
-        php83-pecl-redis=6.1.0-r0 \
-        php83-pecl-swoole=5.1.6-r0 \
-        php83-phar=8.3.15-r0 \
-        php83-posix=8.3.15-r0 \
-        php83-simplexml=8.3.15-r0 \
-        php83-sodium=8.3.15-r0 \
-        php83-tokenizer=8.3.15-r0 \
-        php83-xml=8.3.15-r0 \
-        php83-xmlreader=8.3.15-r0 \
-        php83-xmlwriter=8.3.15-r0 \
-        php83-zip=8.3.15-r0 \
+        php83-pecl-redis=6.2.0-r0 \
+        php83-phar=8.3.36-r0 \
+        php83-posix=8.3.36-r0 \
+        php83-simplexml=8.3.36-r0 \
+        php83-sodium=8.3.36-r0 \
+        php83-tokenizer=8.3.36-r0 \
+        php83-xml=8.3.36-r0 \
+        php83-xmlreader=8.3.36-r0 \
+        php83-xmlwriter=8.3.36-r0 \
+        php83-zip=8.3.36-r0 \
     && ln -sf /usr/bin/php83 /usr/bin/php \
     && mv /etc/php/php.ini /etc/php83/conf.d/zzz_1_php.ini \
     && mv /etc/php/php-fpm.conf /etc/php83/php-fpm.d/zphp.conf
 
+RUN apk add --no-cache libstdc++ c-ares libpq sqlite-libs brotli-libs \
+    && apk add --no-cache --virtual .swoole-build \
+        autoconf g++ make linux-headers php83-dev=8.3.36-r0 \
+        openssl-dev curl-dev c-ares-dev postgresql-dev sqlite-dev brotli-dev \
+    && curl -fsSL https://pecl.php.net/get/swoole-5.1.8.tgz -o /tmp/swoole.tgz \
+    && echo 'c365ccd37b1804527064325a0d2641d4bc33fda23c5b4660dd840ac24f333aa8  /tmp/swoole.tgz' | sha256sum -c - \
+    && tar -xzf /tmp/swoole.tgz -C /tmp \
+    && cd /tmp/swoole-5.1.8 \
+    && phpize83 \
+    && ./configure --with-php-config=/usr/bin/php-config83 \
+        --enable-openssl --enable-sockets --enable-swoole-curl \
+        --enable-cares --enable-brotli --enable-mysqlnd \
+        --enable-swoole-pgsql --enable-swoole-sqlite \
+    && make -j2 \
+    && make install \
+    && echo 'extension=swoole.so' > /etc/php83/conf.d/50_swoole.ini \
+    && apk del .swoole-build \
+    && rm -rf /tmp/swoole* \
+    && php --ri swoole
+
 COPY --from=composer/composer:2.8.5-bin /composer /usr/local/bin/composer
 
 COPY .scripts /devitools/.scripts
diff --git a/php-hyperf/8.3/README-pt-BR.md b/php-hyperf/8.3/README-pt-BR.md
index 67eccf8..33bb15f 100644
--- a/php-hyperf/8.3/README-pt-BR.md
+++ b/php-hyperf/8.3/README-pt-BR.md
@@ -1,5 +1,7 @@
 # Devitools Hyperf Docker Image
 
+A imagem usa Alpine 3.21 e PHP 8.3.36, que corrige CVE-2026-109618 e CVE-2026-109619. O Swoole 5.1.8 é compilado do arquivo PECL com checksum verificado para preservar a compatibilidade com aplicações que exigem Swoole 5.
+
 ## Introdução
 Esta imagem Docker foi criada para fornecer um ambiente otimizado para aplicações **Hyperf** em **PHP 8.3**, suportando tanto ambientes de desenvolvimento quanto de produção.
 
diff --git a/php-hyperf/8.3/README.md b/php-hyperf/8.3/README.md
index b517327..2e1a867 100644
--- a/php-hyperf/8.3/README.md
+++ b/php-hyperf/8.3/README.md
@@ -1,5 +1,7 @@
 # Devitools Hyperf
 
+The image uses Alpine 3.21 and PHP 8.3.36, which fixes CVE-2026-109618 and CVE-2026-109619. Swoole 5.1.8 is built from its checksum-verified PECL archive to preserve compatibility with applications requiring Swoole 5.
+
 Optimized image for running Hyperf applications with PostgreSQL and Swoole support.
 
 ## Introduction