Merge branch 'master' into sqlite3/exceptions-8.3

Author: bohwaz

.cirrus.yml

@@ -184,7 +184,7 @@ asan_task:
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
   freebsd_instance:
-    image_family: freebsd-13-0
+    image_family: freebsd-13-2
   env:
     ARCH: amd64
   install_script:
@@ -211,7 +211,7 @@ freebsd_task:
 arm_task:
   name: ARM_DEBUG_NTS
   arm_container:
-    image: gcc:12
+    image: debian:12
     additional_containers:
       - name: mysql
         image: mysql:8
@@ -233,6 +233,9 @@ arm_task:
     - apt-get update -y
     - >-
         apt-get install -y
+        gcc
+        g++
+        autoconf
         bison
         re2c
         locales
@@ -249,6 +252,7 @@ arm_task:
         libsasl2-dev
         libxpm-dev
         libzip-dev
+        libbz2-dev
         libsqlite3-dev
         libwebp-dev
         libonig-dev
@@ -385,6 +389,7 @@ arm_task:
         -d opcache.jit=function
         -P -q -x -j2
         -g FAIL,BORK,LEAK,XLEAK
+        --no-progress
         --offline
         --show-diff
         --show-slow 1000
@@ -397,6 +402,7 @@ arm_task:
         -d opcache.jit=tracing
         -P -q -x -j2
         -g FAIL,BORK,LEAK,XLEAK
+        --no-progress
         --offline
         --show-diff
         --show-slow 1000

.gitattributes

@@ -22,7 +22,7 @@
 # Collapse generated files within a pull request.
 **/*_arginfo.h linguist-generated
 /Zend/zend_vm_execute.h linguist-generated
-/Zend/zend_vm_opcodes.{h,c} linguist-generated
+/Zend/zend_vm_opcodes.[ch] linguist-generated
 
 # The OSS fuzz files are bunary
 /ext/date/tests/ossfuzz*.txt binary

.github/actions/apt-x32/action.yml

@@ -13,6 +13,7 @@ runs:
         apt-get install -y \
           autoconf \
           bison \
+          curl \
           g++-multilib \
           gcc-multilib \
           language-pack-de \

.github/actions/brew/action.yml

@@ -12,6 +12,7 @@ runs:
           re2c
         brew install \
           openssl@1.1 \
+          curl \
           krb5 \
           bzip2 \
           enchant \

.github/actions/configure-macos/action.yml

@@ -11,6 +11,7 @@ runs:
         set -x
         export PATH="/usr/local/opt/bison/bin:$PATH"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"

.github/actions/notify-slack/action.yml

@@ -5,11 +5,6 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Notify Slack
-      if: always()
-      uses: ravsamhq/notify-slack-action@v1
-      with:
-        status: ${{ job.status }}
-        notify_when: 'failure'
-      env:
-        SLACK_WEBHOOK_URL: ${{ inputs.token }}
+    - shell: bash
+      run: >-
+        curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job in *nightly* failed", "footer": "<https://github.com/php/php-src/actions/runs/${{ github.run_id }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ inputs.token }}

.github/labeler.yml

@@ -5,8 +5,14 @@
 - Zend/Optimizer/**/*
 
 "Category: Build System":
-- build/*
+- '**/*.m4'
+- '**/*.w32'
+- build/**/*
+- buildconf
+- buildconf.bat
+- configure.ac
 - scripts/**/*
+- win32/build/**/*
 
 "Extension: bcmath":
 - ext/bcmath/**/*

.github/nightly_matrix.php

@@ -53,6 +53,7 @@ function get_matrix_include(array $branches) {
             'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
             'run_tests_parameters' => '--asan',
             'test_function_jit' => false,
+            'asan' => true,
         ];
         if ($branch['ref'] !== 'PHP-8.0') {
             $jobs[] = [
@@ -63,6 +64,7 @@ function get_matrix_include(array $branches) {
                 'run_tests_parameters' => '--repeat 2',
                 'timeout_minutes' => 360,
                 'test_function_jit' => true,
+                'asan' => false,
             ];
             $jobs[] = [
                 'name' => '_VARIATION',
@@ -72,6 +74,7 @@ function get_matrix_include(array $branches) {
                 'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
                 'timeout_minutes' => 360,
                 'test_function_jit' => true,
+                'asan' => false,
             ];
         }
     }

.github/scripts/setup-slapd.sh

@@ -42,6 +42,10 @@ sudo sed -e 's|^\s*SLAPD_SERVICES\s*=.*$|SLAPD_SERVICES="ldap:/// ldaps:/// ldap
 # Configure LDAP database.
 DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootDN=*)(olcSuffix=*))' dn | grep -i '^dn:' | sed -e 's/^dn:\s*//'`;
 
+if test -f "/etc/ldap/schema/ppolicy.ldif"; then
+  sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
+fi
+
 sudo service slapd restart
 
 sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF

.github/workflows/nightly.yml

@@ -33,7 +33,7 @@ jobs:
         id: set-matrix
         run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}"
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -59,7 +59,7 @@ jobs:
         zts: [true, false]
         include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
     name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: ubuntu-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
+    runs-on: ubuntu-${{ (matrix.branch.ref == 'master' && !matrix.asan) && '22.04' || '20.04' }}
     steps:
       - name: git checkout
         uses: actions/checkout@v3
@@ -123,7 +123,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -199,7 +199,7 @@ jobs:
             -d opcache.jit_buffer_size=16M
             -d opcache.jit=1205
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -267,7 +267,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -313,7 +313,7 @@ jobs:
         if: always()
         run: bash <(curl -s https://codecov.io/bash)
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -433,7 +433,7 @@ jobs:
             exit 1
           fi
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -516,7 +516,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -614,7 +614,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -665,7 +665,7 @@ jobs:
         with:
           # FIXME: There are new warnings
           # configurationParameters: --enable-werror
-          libmysql: mysql-8.0.30-linux-glibc2.12-x86_64.tar.xz
+          libmysql: mysql-8.0.33-linux-glibc2.12-x86_64.tar.xz
           withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Test mysql-8.0
         uses: ./.github/actions/test-libmysqlclient
@@ -674,7 +674,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
@@ -782,7 +782,7 @@ jobs:
           ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
           make -j$(/usr/bin/nproc)
       - name: Notify Slack
-        if: always()
+        if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}

.github/workflows/push.yml

@@ -215,3 +215,98 @@ jobs:
         run: .github/scripts/windows/build.bat
       - name: Test
         run: .github/scripts/windows/test.bat
+  BENCHMARKING:
+    name: BENCHMARKING
+    if: github.repository_owner == 'php' || github.event_name == 'pull_request'
+    runs-on: ubuntu-22.04
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: apt
+        run: |
+          set -x
+          sudo apt-get update
+          sudo apt-get install \
+            bison \
+            libgmp-dev \
+            libonig-dev \
+            libsqlite3-dev \
+            openssl \
+            re2c \
+            valgrind
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
+          append-timestamp: false
+      - name: ./configure
+        run: |
+          set -x
+          ./buildconf --force
+          ./configure \
+            --disable-debug \
+            --enable-mbstring \
+            --enable-opcache \
+            --enable-option-checking=fatal \
+            --enable-sockets \
+            --enable-werror \
+            --prefix=/usr \
+            --with-config-file-scan-dir=/etc/php.d \
+            --with-gmp \
+            --with-mysqli=mysqlnd \
+            --with-openssl \
+            --with-pdo-sqlite \
+            --with-valgrind
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        run: |
+          set -x
+          sudo make install
+          sudo mkdir -p /etc/php.d
+          sudo chmod 777 /etc/php.d
+          echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
+          echo zend_extension=opcache.so >> /etc/php.d/opcache.ini
+          echo opcache.enable=1 >> /etc/php.d/opcache.ini
+          echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
+      - name: Setup
+        run: |
+          git config --global user.name "Benchmark"
+          git config --global user.email "benchmark@php.net"
+          sudo service mysql start
+          mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS wordpress"
+          mysql -uroot -proot -e "CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress'; FLUSH PRIVILEGES;"
+          mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON *.* TO 'wordpress'@'localhost' WITH GRANT OPTION;"
+      - name: git checkout benchmarking-data
+        uses: actions/checkout@v3
+        with:
+          repository: php/benchmarking-data
+          ssh-key: ${{ secrets.BENCHMARKING_DATA_DEPLOY_KEY }}
+          path: benchmark/repos/data
+      - name: Benchmark
+        run: php benchmark/benchmark.php true
+      - name: Store result
+        if: github.event_name == 'push'
+        run: |
+          set -x
+          cd benchmark/repos/data
+          git pull --autostash
+          if [ -e ".git/MERGE_HEAD" ]; then
+            echo "Merging, can't proceed"
+            exit 1
+          fi
+          git add .
+          if git diff --cached --quiet; then
+            exit 0
+          fi
+          git commit -m "Add result for ${{ github.repository }}@${{ github.sha }}"
+          git push
+      - name: Show diff
+        if: github.event_name == 'pull_request'
+        run: |-
+          php benchmark/generate_diff.php \
+            ${{ github.sha }} \
+            $(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.sha }}) \
+            > $GITHUB_STEP_SUMMARY

CODEOWNERS

@@ -14,18 +14,21 @@
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
+/ext/dom @nielsdos
 /ext/ffi @dstogov
 /ext/gmp @Girgias
 /ext/imap @Girgias
 /ext/json @bukka
+/ext/libxml @nielsdos
 /ext/mbstring @alexdowad
 /ext/opcache @dstogov @iluuu1994
 /ext/openssl @bukka
 /ext/pgsql @devnexen
-/ext/random @TimWolla
+/ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
 /ext/sockets @devnexen
 /ext/spl @Girgias
+/ext/standard @bukka
 /main @bukka
 /sapi/fpm @bukka
 /Zend @iluuu1994