Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Move FreeBSD build to GitHub actions with QEMU

.cirrus.yml

@@ -1,29 +0,0 @@
-env:
-  CIRRUS_CLONE_DEPTH: 1
-
-freebsd_task:
-  name: FREEBSD_DEBUG_NTS
-  skip: "changesIncludeOnly('NEWS', 'EXTENSIONS', 'UPGRADING', 'UPGRADING.INTERNALS', '**.md', 'docs/*', 'docs-old/*', '**/README.*', 'CONTRIBUTING.md', 'CODING_STANDARDS.md')"
-  freebsd_instance:
-    image_family: freebsd-13-3
-  env:
-    ARCH: amd64
-  install_script:
-    #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
-    #- pkg upgrade -y
-    - kldload accf_http
-    - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
-  script:
-    - ./buildconf -f
-    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
-    - gmake -j2
-    - mkdir /etc/php.d
-    - gmake install
-    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
-    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
-    # Specify opcache.preload_user as we're running as root.
-    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
-  tests_script:
-    - export SKIP_IO_CAPTURE_TESTS=1
-    - export CI_NO_IPV6=1
-    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

.github/actions/freebsd/action.yml

@@ -0,0 +1,102 @@
+name: FreeBSD
+runs:
+  using: composite
+  steps:
+    - name: FreeBSD
+      uses: vmactions/freebsd-vm@v1
+      with:
+        release: '13.3'
+        usesh: true
+        # Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.
+        # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269889
+        prepare: |
+          cd $GITHUB_WORKSPACE
+
+          kldload accf_http
+          pkg install -y \
+            autoconf \
+            bison \
+            gmake \
+            re2c \
+            icu \
+            libiconv \
+            png \
+            freetype2 \
+            enchant2 \
+            bzip2 \
+            t1lib \
+            gmp \
+            tidyp \
+            libsodium \
+            libzip \
+            libxml2 \
+            libxslt \
+            openssl \
+            oniguruma \
+            pkgconf \
+            webp \
+            libavif \
+            `#sqlite3` \
+            curl
+
+          ./buildconf -f
+          ./configure \
+            --prefix=/usr/local \
+            --enable-debug \
+            --enable-option-checking=fatal \
+            --enable-fpm \
+            `#--with-pdo-sqlite` \
+            --without-sqlite3 \
+            --without-pdo-sqlite \
+            --without-pear \
+            --with-bz2 \
+            --with-avif \
+            --with-jpeg \
+            --with-webp \
+            --with-freetype \
+            --enable-gd \
+            --enable-exif \
+            --with-zip \
+            --with-zlib \
+            --enable-soap \
+            --enable-xmlreader \
+            --with-xsl \
+            --with-libxml \
+            --enable-shmop \
+            --enable-pcntl \
+            --enable-mbstring \
+            --with-curl \
+            --enable-sockets \
+            --with-openssl \
+            --with-iconv=/usr/local \
+            --enable-bcmath \
+            --enable-calendar \
+            --enable-ftp \
+            --with-ffi \
+            --enable-zend-test \
+            --enable-dl-test=shared \
+            --enable-intl \
+            --with-mhash \
+            --with-sodium \
+            --with-config-file-path=/etc \
+            --with-config-file-scan-dir=/etc/php.d
+          gmake -j2
+          mkdir /etc/php.d
+          gmake install > /dev/null
+          echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+          echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+          echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+        run: |
+          cd $GITHUB_WORKSPACE
+
+          export SKIP_IO_CAPTURE_TESTS=1
+          export CI_NO_IPV6=1
+          export STACK_LIMIT_DEFAULTS_CHECK=1
+          sapi/cli/php run-tests.php \
+            -P -q -j2 \
+            -g FAIL,BORK,LEAK,XLEAK \
+            --offline \
+            --show-diff \
+            --show-slow 1000 \
+            --set-timeout 120 \
+            -d zend_extension=opcache.so

.github/workflows/nightly.yml

@@ -981,3 +981,13 @@ jobs:
         run: .github/scripts/windows/build.bat
       - name: Test
         run: .github/scripts/windows/test.bat
+  FREEBSD:
+    name: FREEBSD
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: FreeBSD
+        uses: ./.github/actions/freebsd

.github/workflows/push.yml

@@ -217,3 +217,11 @@ jobs:
         run: .github/scripts/windows/build.bat
       - name: Test
         run: .github/scripts/windows/test.bat
+  FREEBSD:
+    name: FREEBSD
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+      - name: FreeBSD
+        uses: ./.github/actions/freebsd