compat with latest version

Author: dunglas

Dockerfile

@@ -32,7 +32,7 @@ RUN apt-get update && \
     && \
     apt-get clean
 
-RUN git clone --depth=1 --single-branch --branch=frankenphp-8.2 https://github.com/dunglas/php-src.git && \
+RUN git clone --depth=1 --single-branch --branch=frankenphp https://github.com/dunglas/php-src.git && \
     cd php-src && \
     # --enable-embed is only necessary to generate libphp.so, we don't use this SAPI directly
     ./buildconf && \

Dockerfile.alpine

@@ -1,7 +1,86 @@
-FROM php:8.2-zts-alpine3.17 AS builder
+FROM php:8.2-zts-alpine3.17 AS php-base
 
-COPY --from=golang:1.19-alpine3.17 /usr/local/go/bin/go /usr/local/bin/go
-COPY --from=golang:1.19-alpine3.17 /usr/local/go /usr/local/go
+# Note that this image is based on the official PHP image, once https://github.com/php/php-src/pull/10141 is merged, this stage can be removed
+
+RUN rm -Rf /usr/local/include/php/ /usr/local/lib/libphp.* /usr/local/lib/php/ /usr/local/php/
+
+ENV PHPIZE_DEPS \
+    autoconf \
+    dpkg-dev dpkg \
+    file \
+    g++ \
+    gcc \
+    libc-dev \
+    make \
+    pkgconf \
+    re2c
+
+RUN apk add --no-cache --virtual .build-deps \
+    $PHPIZE_DEPS \
+    argon2-dev \
+    coreutils \
+    curl-dev \
+    readline-dev \
+    libsodium-dev \
+    sqlite-dev \
+    openssl-dev \
+    libxml2-dev \
+    gnu-libiconv-dev \
+    linux-headers \
+    oniguruma-dev \
+    bison \
+    git
+
+RUN git clone --depth=1 --single-branch --branch=frankenphp https://github.com/dunglas/php-src.git
+
+WORKDIR /php-src/
+
+# --enable-embed is only necessary to generate libphp.so, we don't use this SAPI directly
+RUN ./buildconf
+RUN ./configure \
+        --enable-embed \
+        --enable-zts \
+        --disable-zend-signals \
+    	# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
+    	--enable-mysqlnd \
+     	# make sure invalid --configure-flags are fatal errors instead of just warnings
+    	--enable-option-checking=fatal \
+    	# https://github.com/docker-library/php/issues/439
+    	--with-mhash \
+    	# https://github.com/docker-library/php/issues/822
+    	--with-pic \
+    	# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
+    	--enable-ftp \
+    	# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
+    	--enable-mbstring \
+    	# https://wiki.php.net/rfc/argon2_password_hash
+    	--with-password-argon2 \
+    	# https://wiki.php.net/rfc/libsodium
+    	--with-sodium=shared \
+    	# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109)
+		--with-pdo-sqlite=/usr \
+		--with-sqlite3=/usr \
+		--with-curl \
+		--with-iconv \
+		--with-openssl \
+		--with-readline \
+		--with-zlib \
+    	# https://github.com/bwoebi/phpdbg-docs/issues/1#issuecomment-163872806 ("phpdbg is primarily a CLI debugger, and is not suitable for debugging an fpm stack.")
+		--disable-phpdbg \
+        --with-config-file-path="$PHP_INI_DIR" \
+        --with-config-file-scan-dir="$PHP_INI_DIR/conf.d"
+RUN make -j$(nproc)
+RUN make install
+RUN rm -Rf /php-src/
+RUN echo "Creating src archive for building extensions\n"
+RUN tar -c -f /usr/src/php.tar.xz -J /php-src/
+#RUN ldconfig
+RUN php --version
+
+FROM php-base AS builder
+
+COPY --from=golang:alpine3.16 /usr/local/go/bin/go /usr/local/bin/go
+COPY --from=golang:alpine3.16 /usr/local/go /usr/local/go
 
 RUN apk add --no-cache --virtual .build-deps \
 		$PHPIZE_DEPS \
@@ -44,7 +123,7 @@ RUN cd caddy/frankenphp && \
 
 ENTRYPOINT ["/bin/sh","-c"]
 
-FROM php:8.2-zts-alpine3.17 AS final
+FROM php:8.2-zts-alpine3.16 AS final
 
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
 

Dockerfile.dev

@@ -37,7 +37,7 @@ RUN apt-get update && \
     && \
     apt-get clean 
 
-RUN git clone --branch=frankenphp-8.2 https://github.com/dunglas/php-src.git && \
+RUN git clone --branch=frankenphp https://github.com/dunglas/php-src.git && \
     cd php-src && \
     # --enable-embed is only necessary to generate libphp.so, we don't use this SAPI directly
     ./buildconf && \

frankenphp.c

@@ -25,7 +25,7 @@ ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 
 /* Timeouts are currently fundamentally broken with ZTS except on Linux: https://bugs.php.net/bug.php?id=79464 */
-#ifndef ZEND_TIMER
+#ifndef ZEND_TIMERS
 static const char HARDCODED_INI[] =
 	"max_execution_time=0\n"
 	"max_input_time=-1\n\0";
@@ -61,7 +61,7 @@ frankenphp_config frankenphp_get_config() {
 #else
 		false,
 #endif
-#ifdef ZEND_TIMER
+#ifdef ZEND_TIMERS
 		true,
 #else
 		false,
@@ -559,7 +559,7 @@ static void *manager_thread(void *arg) {
 
     sapi_startup(&frankenphp_sapi_module);
 
-#ifndef ZEND_TIMER
+#ifndef ZEND_TIMERS
 	frankenphp_sapi_module.ini_entries = malloc(sizeof(HARDCODED_INI));
 	memcpy(frankenphp_sapi_module.ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI));
 #endif