Merge branch 'master' into unserialize-notice-to-warning

* master: (274 commits)
  Cache UTF-8-validity status of strings in GC flags
  Escape the role attribute of namespaced classes (php#9952)
  Fix phpGH-9932: Discards further characters for session name.
  Fix phpGH-9890: OpenSSL legacy providers not available on Windows
  Fix regression test for phpGH-9535 on PHP-8.2+
  Fix memory leak
  Introduce TEST_FPM_EXTENSION_DIR for FPM tests with shared extensions
  [ci skip] NEWS
  Fix phpGH-9535 (unintended behavior change for mb_strcut in PHP 8.1)
  [ci skip] NEWS
  [ci skip] NEWS
  Fix phpGH-9298: remove all registered signal handlers in pcntl RSHUTDOWN
  Fix phpGH-9923: Add the `SIGINFO` constant in pcntl for system supporting it.
  Skip tests if extension or SAPI is not included. (php#9939)
  Remove unused PHP 8.1 BC layer in JIT (php#9937)
  [skip ci] Skip function JIT in nightly for ASAN
  [skip ci] Backport XFAIL of failing test
  Disable opcache file_cache for observer preloading test
  No more need to cater to mime_magic extension
  [ci skip] Fix phpGH-9918: License information for xxHash is not included in README.REDIST.BINS file
  ...

Author: TimWolla

.appveyor.yml

@@ -2,12 +2,7 @@ version: "{branch}.build.{build}"
 
 image: Visual Studio 2019
 
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-clone_depth: 64
+clone_depth: 1
 
 skip_commits:
   files:
@@ -41,7 +36,7 @@ environment:
                 - THREAD_SAFE: 1
                   OPCACHE: 1
                   PARALLEL: -j2
-                  INTRINSICS: AVX
+                  INTRINSICS: AVX2
 
 services:
         # the setup scripts have to be touched, once some other db version is used
@@ -51,10 +46,10 @@ services:
 
 platform:
         - x64
-          #        - x86
+        #- x86
 
 build_script:
-        - appveyor\build.bat
+        - .github\scripts\windows\build.bat
 
 test_script:
-        - appveyor\test.bat
+        - .github\scripts\windows\test.bat

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

@@ -0,0 +1,52 @@
+name: apt
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+
+        export DEBIAN_FRONTEND=noninteractive
+        dpkg --add-architecture i386
+        apt-get update -y | true
+        # TODO: Reenable postgresql + postgresql-contrib packages once they work again.
+        apt-get install -y \
+          autoconf \
+          bison \
+          g++-multilib \
+          gcc-multilib \
+          language-pack-de \
+          libaspell-dev:i386 \
+          libbz2-dev:i386 \
+          libc6:i386 \
+          libcurl4-openssl-dev:i386 \
+          libffi-dev:i386 \
+          libfreetype6-dev:i386 \
+          libgmp-dev:i386 \
+          libgssapi-krb5-2:i386 \
+          libicu-dev:i386 \
+          libjpeg-dev:i386 \
+          libkrb5-dev:i386 \
+          libonig-dev:i386 \
+          libpng-dev:i386 \
+          libpq-dev:i386 \
+          libpspell-dev:i386 \
+          libreadline-dev:i386 \
+          libsasl2-dev:i386 \
+          libsodium-dev:i386 \
+          libsqlite3-dev:i386 \
+          libssl-dev:i386 \
+          libtidy-dev:i386 \
+          libwebp-dev:i386 \
+          libxml2-dev:i386 \
+          libxml2-dev:i386 \
+          libxpm-dev:i386 \
+          libxslt1-dev:i386 \
+          libzip-dev:i386 \
+          locales \
+          make \
+          pkg-config:i386 \
+          re2c \
+          unzip \
+          wget \
+          zlib1g-dev:i386

.github/actions/build-libmysqlclient/action.yml

@@ -22,13 +22,13 @@ runs:
         wget -nv $URL
         tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
         PDO_MYSQL=${MYSQL_DIR}
-        ${{ inputs.withMysqli && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' }}
+        ${{ inputs.withMysqli == 'true' && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' || '' }}
         ./buildconf --force
         ./configure ${{ inputs.configurationParameters }} \
           --enable-option-checking=fatal \
           --disable-all \
           --enable-pdo \
           --with-pdo-mysql=${PDO_MYSQL} \
-          ${{ inputs.withMysqli && '--with-mysqli=${MYSQLI}' }}
+          ${{ inputs.withMysqli == 'true' && '--with-mysqli=${MYSQLI}' || '' }}
         make clean
         make -j$(/usr/bin/nproc) >/dev/null

azure/i386/job.yml renamed to .github/actions/configure-x32/action.yml

@@ -1,22 +1,20 @@
-parameters:
-  configurationName: ''
-  configurationParameters: ''
-  timeoutInMinutes: 75
+name: ./configure
+inputs:
+  configurationParameters:
+    default: ''
+    required: false
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
 
-jobs:
-  - job: ${{ parameters.configurationName }}
-    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-    pool:
-      vmImage: 'ubuntu-20.04'
-    steps:
-    - template: apt.yml
-    - script: |
         ./buildconf --force
         export CFLAGS="-m32 -msse2"
         export CXXFLAGS="-m32 -msse2"
         export LDFLAGS=-L/usr/lib/i386-linux-gnu
-        export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
-        ./configure ${{ parameters.configurationParameters }} \
+        ./configure ${{ inputs.configurationParameters }} \
             --enable-option-checking=fatal \
             --build=i686-pc-linux-gnu \
             --prefix=/usr \
@@ -69,27 +67,3 @@ jobs:
             --enable-werror \
             --with-config-file-path=/etc \
             --with-config-file-scan-dir=/etc/php.d
-      displayName: 'Configure Build'
-    - script: make -j$(/usr/bin/nproc) >/dev/null
-      displayName: 'Make Build'
-    - script: |
-        set -e
-        sudo make install
-        sudo mkdir     /etc/php.d
-        sudo chmod 777 /etc/php.d
-        echo mysqli.default_socket=/var/run/mysqld/mysqld.sock     > /etc/php.d/mysqli.ini
-        echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock  > /etc/php.d/pdo_mysql.ini
-        echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
-        echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
-      displayName: 'Install Build'
-    - script: |
-        set -e
-        sudo service mysql start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        #sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        #sudo -u postgres psql -c "CREATE DATABASE test;"
-      displayName: 'Setup'
-    - template: ../tests.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsParameters: ${{ parameters.runTestsParameters }}

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

@@ -72,7 +72,6 @@ runs:
           --with-snmp \
           --with-unixODBC \
           --with-imap \
-          --with-kerberos \
           --with-imap-ssl \
           --with-pdo-odbc=unixODBC,/usr \
           --with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \

.github/actions/install-linux-x32/action.yml

@@ -0,0 +1,15 @@
+name: Install
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        make install
+        mkdir /etc/php.d
+        chmod 777 /etc/php.d
+        echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
+        echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
+        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

.github/actions/test-libmysqlclient/action.yml

@@ -8,16 +8,14 @@ runs:
     - shell: bash
       run: |
         set -x
-        ${{ inputs.withMysqli && 'export MYSQL_TEST_USER=root' }}
-        ${{ inputs.withMysqli && 'export MYSQL_TEST_PASSWD=root' }}
+        ${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_USER=root' || '' }}
+        ${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_PASSWD=root' || '' }}
         export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
         export PDO_MYSQL_TEST_HOST=127.0.0.1
         export PDO_MYSQL_TEST_USER=root
         export PDO_MYSQL_TEST_PASS=root
-        export TEST_PHP_JUNIT=junit.xml
         export REPORT_EXIT_STATUS=no
-        rm -rf junit.xml | true
         sapi/cli/php run-tests.php -P -q \
           -g FAIL,BORK,LEAK,XLEAK \
-          --offline --show-diff --show-slow 1000 --set-timeout 120 \
+          --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 \
           ext/pdo_mysql

.github/actions/test-linux/action.yml

@@ -14,7 +14,9 @@ runs:
         set -x
         export MYSQL_TEST_USER=root
         export MYSQL_TEST_PASSWD=root
-        export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
+        if [[ -z "$PDO_MYSQL_TEST_DSN" ]]; then
+          export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
+        fi
         export PDO_MYSQL_TEST_USER=root
         export PDO_MYSQL_TEST_PASS=root
         export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"

azure/lsan-suppressions.txt renamed to .github/lsan-suppressions.txt

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

.github/nightly_matrix.php

@@ -1,5 +1,5 @@
 #!/bin/sh
-set -ev
+set -ex
 
 # Create TLS certificate
 sudo mkdir -p /etc/ldap/ssl

.github/scripts/setup-slapd.sh

@@ -38,7 +38,7 @@ if not exist "%SDK_RUNNER%" (
 	exit /b 3
 )
 
-cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat
+cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\build_task.bat
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0

appveyor/build.bat renamed to .github/scripts/windows/build.bat

@@ -6,7 +6,7 @@ if not exist "%SDK_RUNNER%" (
 	exit /b 3
 )
 
-cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat
+cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\.github\scripts\windows\test_task.bat
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0

appveyor/build_task.bat renamed to .github/scripts/windows/build_task.bat

@@ -15,7 +15,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v6
         with:
           days-before-close: 14
           days-before-stale: 90

appveyor/test.bat renamed to .github/scripts/windows/test.bat

@@ -15,7 +15,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v6
         with:
           days-before-close: 7
           days-before-stale: 60

appveyor/test_task.bat renamed to .github/scripts/windows/test_task.bat

@@ -2,13 +2,15 @@ name: "Pull Request Labeler"
 on:
   - pull_request_target
 
+permissions:
+  contents: read
+
 jobs:
   triage:
     permissions:
-      contents: read
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/labeler@v4
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"