DEBUG: Apply suggestions per php/php-src#14792 to test CI

Author: jnoordsij

8.4-rc/alpine3.19/cli/Dockerfile

@@ -48,6 +48,10 @@ ENV PHPIZE_DEPS \
 RUN apk add --no-cache \
 		ca-certificates \
 		curl \
+{{ if [ "8.4-rc" ] | index(env.version) then ( -}}
+		autoconf \
+		git \
+{{ ) else "" end -}}
 		openssl \
 		tar \
 		xz
@@ -66,6 +70,9 @@ RUN set -eux; \
 		$PHPIZE_DEPS \
 		ca-certificates \
 		curl \
+{{ if [ "8.4-rc" ] | index(env.version) then ( -}}
+		git \
+{{ ) else "" end -}}
 		xz-utils \
 	; \
 	rm -rf /var/lib/apt/lists/*

8.4-rc/alpine3.19/cli/docker-php-source

@@ -76,6 +76,9 @@ for version; do
 		if [ "$variant" = 'apache' ]; then
 			cp -a apache2-foreground "$version/$dir/"
 		fi
+		if [ "$version" = '8.4-rc' ]; then
+			cp -a docker-php-source-patched "$version/$dir/docker-php-source"
+		fi
 
 		cmd="$(jq <<<"$cmd" -r '.[0]')"
 		if [ "$cmd" != 'php' ]; then

8.4-rc/alpine3.19/fpm/Dockerfile

@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+
+dir=/usr/src/php
+
+usage() {
+	echo "usage: $0 COMMAND"
+	echo
+	echo "Manage php source tarball lifecycle."
+	echo
+	echo "Commands:"
+	echo "   extract  extract php source tarball into directory $dir if not already done."
+	echo "   delete   delete extracted php source located into $dir if not already done."
+	echo
+}
+
+case "$1" in
+	extract)
+		mkdir -p "$dir"
+		if [ ! -f "$dir/.docker-extracted" ]; then
+			tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
+			curl -s https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch | git -C "$dir" apply --reject || true
+			$dir/buildconf -f
+			touch "$dir/.docker-extracted"
+		fi
+		;;
+
+	delete)
+		rm -rf "$dir"
+		;;
+
+	*)
+		usage
+		exit 1
+		;;
+esac