Merge branch 'main' into feat/intl-win

Author: henderkes

.github/pull_request_template.md

@@ -7,7 +7,11 @@
 > If your PR involves the changes mentioned below and completed the action, please tick the corresponding option.
 > If a modification is not involved, please skip it directly.
 
-- [ ] If you modified `*.php`, run `composer cs-fix` at local machine.
-- [ ] If it's an extension or dependency update, make sure adding related extensions in `src/global/test-extensions.php`.
-- [ ] If you changed the behavior of static-php-cli, update docs in `./docs/`.
-- [ ] If you updated `config/xxx.json` content, run `bin/spc dev:sort-config xxx`.
+- If you modified `*.php` or `*.json`, run them locally to ensure your changes are valid:
+  - [ ] `PHP_CS_FIXER_IGNORE_ENV=1 composer cs-fix`
+  - [ ] `composer analyse`
+  - [ ] `composer test`
+  - [ ] `bin/spc dev:sort-config`
+- If it's an extension or dependency update, please ensure the following:
+  - [ ] Add your test combination to `src/globals/test-extensions.php`.
+  - [ ] If adding new or fixing bugs, add commit message containing `extension test` or `test extensions` to trigger full test suite.

.github/workflows/ext-matrix-tests.yml

@@ -1,16 +1,14 @@
-name: "Extension matrix tests"
+name: "Extension Matrix Tests"
 
 on:
   workflow_dispatch:
-  pull_request:
-    branches: [ "main" ]
-    paths:
-      - '.github/workflows/ext-matrix-tests.yml'
+  push:
 
 jobs:
   test:
     name: "${{ matrix.extension }} (PHP ${{ matrix.php-version }} on ${{ matrix.operating-system }})"
     runs-on: ${{ matrix.operating-system }}
+    if: contains(github.event.head_commit.message, 'extension test') || contains(github.event.head_commit.message, 'test extensions')
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -10,6 +10,9 @@ docker/source/
 # default source extract directory
 /source/**
 
+# built by shared embed tests
+/locale/
+
 # default source download directory
 /downloads/**
 

README-zh.md

@@ -278,7 +278,7 @@ bin/spc micro:combine my-app.phar -I "memory_limit=4G" -I "disable_functions=sys
 
 如果你知道 [embed SAPI](https://github.com/php/php-src/tree/master/sapi/embed)，你应该知道如何使用它。对于有可能编译用到引入其他库的问题，你可以使用 `buildroot/bin/php-config` 来获取编译时的配置。
 
-另外，有关如何使用此功能的高级示例，请查看[如何使用它构建 FrankenPHP 的静态版本](https://github.com/dunglas/frankenphp/blob/main/docs/static.md)。
+另外，有关如何使用此功能的高级示例，请查看[如何使用它构建 FrankenPHP 的静态版本](https://github.com/php/frankenphp/blob/main/docs/static.md)。
 
 ## 贡献
 

README.md

@@ -302,7 +302,7 @@ If you know [embed SAPI](https://github.com/php/php-src/tree/master/sapi/embed),
 You may require the introduction of other libraries during compilation,
 you can use `buildroot/bin/php-config` to obtain the compile-time configuration.
 
-For an advanced example of how to use this feature, take a look at [how to use it to build a static version of FrankenPHP](https://github.com/dunglas/frankenphp/blob/main/docs/static.md).
+For an advanced example of how to use this feature, take a look at [how to use it to build a static version of FrankenPHP](https://github.com/php/frankenphp/blob/main/docs/static.md).
 
 ## Contribution
 

bin/spc-alpine-docker

@@ -1,12 +1,14 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+set -e
 
 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v3
+SPC_DOCKER_VERSION=v4
 
 # Detect docker can run
 if ! which docker >/dev/null; then
-  echo "Docker is not installed, please install docker first !"
-  exit 1
+    echo "Docker is not installed, please install docker first !"
+    exit 1
 fi
 DOCKER_EXECUTABLE="docker"
 # shellcheck disable=SC2046
@@ -22,27 +24,48 @@ if [ $(id -u) -ne 0 ]; then
     fi
 fi
 
-
-
-# to check if qemu-docker run
-if [ "$SPC_USE_ARCH" = "" ]; then
-    SPC_USE_ARCH=x86_64
+# Convert uname to gnu arch
+CURRENT_ARCH=$(uname -m)
+if [ "$CURRENT_ARCH" = "arm64" ]; then
+    CURRENT_ARCH=aarch64
+fi
+if [ -z "$SPC_USE_ARCH" ]; then
+    SPC_USE_ARCH=$CURRENT_ARCH
 fi
+# parse SPC_USE_ARCH
 case $SPC_USE_ARCH in
-x86_64)
-    ALPINE_FROM=alpine:edge
+x86_64|amd64)
+    SPC_USE_ARCH=x86_64
+    if [ "$CURRENT_ARCH" != "x86_64" ]; then
+        PLATFORM_ARG="--platform linux/amd64"
+        ALPINE_FROM=multiarch/alpine:x86_64-edge
+    fi
     ;;
-aarch64)
-    ALPINE_FROM=multiarch/alpine:aarch64-edge
-    # shellcheck disable=SC2039
-    echo -e "\e[033m* Using different arch needs to setup qemu-static for docker !\e[0m"
-    $DOCKER_EXECUTABLE run --rm --privileged multiarch/qemu-user-static:register --reset > /dev/null
+aarch64|arm64)
+    SPC_USE_ARCH=aarch64
+    if [ "$CURRENT_ARCH" != "aarch64" ]; then
+        PLATFORM_ARG="--platform linux/arm64"
+        ALPINE_FROM=multiarch/alpine:aarch64-edge
+    fi
     ;;
 *)
     echo "Current arch is not supported to run in docker: $SPC_USE_ARCH"
     exit 1
     ;;
 esac
+# if ALPINE_FROM is not set, use alpine:edge
+if [ -z "$ALPINE_FROM" ]; then
+    ALPINE_FROM=alpine:edge
+fi
+if [ "$SPC_USE_ARCH" != "$CURRENT_ARCH" ]; then
+    echo "* Using different arch needs to setup qemu-static for docker !"
+    ALPINE_FROM=multiarch/alpine:$SPC_USE_ARCH-edge
+    if [ "$(uname -s)" = "Linux" ]; then
+        $DOCKER_EXECUTABLE run --rm --privileged multiarch/qemu-user-static:register --reset > /dev/null
+    fi
+else
+    ALPINE_FROM=alpine:edge
+fi
 
 if [ "$SPC_USE_MIRROR" = "yes" ]; then
     SPC_USE_MIRROR="RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories"
@@ -53,7 +76,7 @@ fi
 # Detect docker env is setup
 if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION; then
     echo "Docker container does not exist. Building docker image ..."
-    $DOCKER_EXECUTABLE build -t cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION -f- . <<EOF
+    $DOCKER_EXECUTABLE build $PLATFORM_ARG -t cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION -f- . <<EOF
 FROM $ALPINE_FROM
 $SPC_USE_MIRROR
 RUN apk update; \
@@ -84,7 +107,8 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold
+        binutils-gold \
+        patchelf
 
 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
     chmod +x /usr/local/bin/php
@@ -147,7 +171,7 @@ if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then
     echo "*    ./pkgroot:   $(pwd)/pkgroot"
     echo "*"
     set -ex
-    $DOCKER_EXECUTABLE run --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION /bin/bash
 else
-    $DOCKER_EXECUTABLE run --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST $MOUNT_LIST cwcc-spc-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
 fi

bin/spc-gnu-docker

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+set -e
+
+# This file is using docker to run commands
+SPC_DOCKER_VERSION=v4
+
 # Detect docker can run
 if ! which docker >/dev/null; then
   echo "Docker is not installed, please install docker first !"
@@ -19,35 +24,47 @@ if [ $(id -u) -ne 0 ]; then
     fi
 fi
 
-
-
-# to check if qemu-docker run
-if [ "$SPC_USE_ARCH" = "" ]; then
-    SPC_USE_ARCH=current
+# Convert uname to gnu arch
+CURRENT_ARCH=$(uname -m)
+if [ "$CURRENT_ARCH" = "arm64" ]; then
+    CURRENT_ARCH=aarch64
+fi
+if [ -z "$SPC_USE_ARCH" ]; then
+    SPC_USE_ARCH=$CURRENT_ARCH
 fi
+# parse SPC_USE_ARCH
 case $SPC_USE_ARCH in
-current)
-    BASE_ARCH=$(uname -m)
-    if [ "$BASE_ARCH" = "arm64" ]; then
-        BASE_ARCH=aarch64
+x86_64|amd64)
+    SPC_USE_ARCH=x86_64
+    SPC_USE_ARCH_DOCKER=amd64
+    if [ "$CURRENT_ARCH" != "x86_64" ]; then
+        PLATFORM_ARG="--platform linux/amd64"
     fi
     ;;
-aarch64)
-    BASE_ARCH=aarch64
-    # shellcheck disable=SC2039
-    echo -e "\e[033m* Using different arch needs to setup qemu-static for docker !\e[0m"
-    $DOCKER_EXECUTABLE run --rm --privileged multiarch/qemu-user-static:register --reset > /dev/null
+aarch64|arm64)
+    SPC_USE_ARCH=aarch64
+    SPC_USE_ARCH_DOCKER=arm64
+    if [ "$CURRENT_ARCH" != "aarch64" ]; then
+        PLATFORM_ARG="--platform linux/arm64"
+    fi
     ;;
 *)
     echo "Current arch is not supported to run in docker: $SPC_USE_ARCH"
     exit 1
     ;;
 esac
+# detect if we need to use qemu-static
+if [ "$SPC_USE_ARCH" != "$CURRENT_ARCH" ]; then
+    if [ "$(uname -s)" = "Linux" ]; then
+        echo "* Using different arch needs to setup qemu-static for docker !"
+        $DOCKER_EXECUTABLE run --rm --privileged multiarch/qemu-user-static --reset -p yes > /dev/null
+    fi
+fi
 
 # Detect docker env is setup
-if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-gnu-$SPC_USE_ARCH; then
+if ! $DOCKER_EXECUTABLE images | grep -q cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION; then
     echo "Docker container does not exist. Building docker image ..."
-    $DOCKER_EXECUTABLE build -t cwcc-spc-gnu-$SPC_USE_ARCH -f- . <<EOF
+    $DOCKER_EXECUTABLE buildx build $PLATFORM_ARG --no-cache -t cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION -f- . <<EOF
 FROM centos:7
 RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \
     sed -i 's/^#.*baseurl=http/baseurl=http/g' /etc/yum.repos.d/*.repo && \
@@ -59,7 +76,7 @@ RUN yum clean all && \
 
 RUN yum install -y centos-release-scl
 
-RUN if [ "$BASE_ARCH" = "aarch64" ]; then \
+RUN if [ "$SPC_USE_ARCH" = "aarch64" ]; then \
         sed -i 's|mirror.centos.org/centos|vault.centos.org/altarch|g' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo ; \
         sed -i 's|mirror.centos.org/centos|vault.centos.org/altarch|g' /etc/yum.repos.d/CentOS-SCLo-scl.repo ; \
     else \
@@ -72,8 +89,14 @@ RUN yum update -y && \
     yum install -y devtoolset-10-gcc-*
 RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
+RUN yum install -y which
+
+RUN curl -fsSL -o patchelf.tgz https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$SPC_USE_ARCH.tar.gz && \
+    mkdir -p /patchelf && \
+    tar -xzf patchelf.tgz -C /patchelf --strip-components=1 && \
+    cp /patchelf/bin/patchelf /usr/bin/
 
-RUN curl -o cmake.tgz -fsSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$BASE_ARCH.tar.gz && \
+RUN curl -o cmake.tgz -fsSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$SPC_USE_ARCH.tar.gz && \
     mkdir /cmake && \
     tar -xzf cmake.tgz -C /cmake --strip-components 1
 
@@ -88,7 +111,7 @@ ENV PATH="/app/bin:/cmake/bin:$PATH"
 ENV SPC_LIBC=glibc
 
 ADD ./config/env.ini /app/config/env.ini
-RUN bin/spc doctor --auto-fix --debug
+RUN CC=gcc bin/spc doctor --auto-fix --debug
 
 RUN curl -o make.tgz -fsSL https://ftp.gnu.org/gnu/make/make-4.4.tar.gz && \
     tar -zxvf make.tgz && \
@@ -135,7 +158,7 @@ echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' > /tmp/spc-gnu-docker.env
 echo 'CXX=/opt/rh/devtoolset-10/root/usr/bin/g++' >> /tmp/spc-gnu-docker.env
 echo 'AR=/opt/rh/devtoolset-10/root/usr/bin/ar' >> /tmp/spc-gnu-docker.env
 echo 'LD=/opt/rh/devtoolset-10/root/usr/bin/ld' >> /tmp/spc-gnu-docker.env
-echo 'SPC_DEFAULT_C_FLAGS=-fPIE -fPIC' >> /tmp/spc-gnu-docker.env
+echo 'SPC_DEFAULT_C_FLAGS=-fPIC' >> /tmp/spc-gnu-docker.env
 echo 'SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
@@ -167,7 +190,7 @@ if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then
     echo "*    ./pkgroot:   $(pwd)/pkgroot"
     echo "*"
     set -ex
-    $DOCKER_EXECUTABLE run --rm -it --privileged $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --privileged --rm -it $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION /bin/bash
 else
-    $DOCKER_EXECUTABLE run --rm $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH bin/spc $@
+    $DOCKER_EXECUTABLE run $PLATFORM_ARG --rm $INTERACT $ENV_LIST --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH-$SPC_DOCKER_VERSION bin/spc $@
 fi

config/env.ini

@@ -42,6 +42,9 @@ SPC_CONCURRENCY=${CPU_COUNT}
 SPC_SKIP_PHP_VERSION_CHECK="no"
 ; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed")
 SPC_SKIP_DOCTOR_CHECK_ITEMS=""
+; extra modules that xcaddy will include in the FrankenPHP build
+SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES="--with github.com/dunglas/frankenphp/caddy --with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy --with github.com/dunglas/caddy-cbrotli"
+
 ; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
 ; only useful for builds targeting not pure-static linking
 ; default paths
@@ -66,10 +69,10 @@ SPC_LIBC=musl
 CC=${SPC_LINUX_DEFAULT_CC}
 CXX=${SPC_LINUX_DEFAULT_CXX}
 AR=${SPC_LINUX_DEFAULT_AR}
-LD=ld.gold
+LD=${SPC_LINUX_DEFAULT_LD}
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_C_FLAGS="-fPIC"
-SPC_DEFAULT_CXX_FLAGS=
+SPC_DEFAULT_C_FLAGS="-fPIC -Os"
+SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
 ; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
 SPC_EXTRA_LIBS=
 ; upx executable path
@@ -81,7 +84,7 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 ; buildconf command
 SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
 ; configure command
-SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg --with-pic"
+SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable-shared --enable-static --disable-all --disable-cgi --disable-phpdbg --with-pic"
 ; make command
 SPC_CMD_PREFIX_PHP_MAKE="make -j${CPU_COUNT}"
 ; embed type for php, static (libphp.a) or shared (libphp.so)
@@ -97,9 +100,11 @@ SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
 ; LIBS for configuring php
 SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lpthread -lm"
 ; EXTRA_CFLAGS for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Os -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-ident -fPIE -fPIC"
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LIBS for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm"
+; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
 ; EXTRA_LDFLAGS_PROGRAM for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -Wl,-O1 -pie"
 
@@ -108,8 +113,8 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -Wl,-O1 -pie"
 CC=clang
 CXX=clang++
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin"
-SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin"
+SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
+SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 ; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
 SPC_EXTRA_LIBS=
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -131,7 +136,7 @@ SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}"
 ; LDFLAGS for configuring php
 SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
 ; EXTRA_CFLAGS for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Os -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LIBS for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-lresolv"
 ; embed type for php, static (libphp.a) or shared (libphp.dylib)