Merge tag 'php-8.2.26' into was-8.2.x

Tag for php-8.2.26

Author: MaxKellermann

.github/CODEOWNERS

@@ -46,6 +46,7 @@
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
 /ext/simplexml @nielsdos
+/ext/soap @nielsdos
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka

.github/actions/brew/action.yml

@@ -19,6 +19,7 @@ runs:
           enchant \
           libffi \
           intltool \
+          icu4c \
           libiconv \
           t1lib \
           libxml2 \

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

@@ -9,6 +9,7 @@ runs:
     - shell: bash
       run: |
         set -x
+        BREW_OPT="$(brew --prefix)"/opt
         export PATH="/usr/local/opt/bison/bin:$PATH"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/[email protected]/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig"
@@ -18,8 +19,10 @@ runs:
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
+        sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"
         ./buildconf --force
         ./configure \
+          CFLAGS="-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion" \
           --enable-option-checking=fatal \
           --prefix=/usr/local \
           --enable-fpm \

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

@@ -3,6 +3,9 @@ inputs:
   configurationParameters:
     default: ''
     required: false
+  asan:
+    default: false
+    required: false
 runs:
   using: composite
   steps:

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

@@ -31,6 +31,10 @@ runs:
         export PDO_OCI_TEST_USER="system"
         export PDO_OCI_TEST_PASS="pass"
         export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
+        export PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=postgres password=postgres"
+        if [[ -z "$PDO_PGSQL_TEST_DSN" ]]; then
+          export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres"
+        fi
         export SKIP_IO_CAPTURE_TESTS=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \

.github/nightly_matrix.php

@@ -1,23 +1,17 @@
 <?php
 
-const BRANCHES = ['master', 'PHP-8.2', 'PHP-8.1', 'PHP-8.0'];
+const BRANCHES = [
+    ['ref' => 'master', 'version' => [8, 5]],
+    ['ref' => 'PHP-8.4', 'version' => [8, 4]],
+    ['ref' => 'PHP-8.3', 'version' => [8, 3]],
+    ['ref' => 'PHP-8.2', 'version' => [8, 2]],
+    ['ref' => 'PHP-8.1', 'version' => [8, 1]],
+];
 
 function get_branch_commit_cache_file_path(): string {
     return dirname(__DIR__) . '/branch-commit-cache.json';
 }
 
-function get_branch_matrix(array $branches) {
-    $result = array_map(function ($branch) {
-        $branch_key = strtoupper(str_replace('.', '', $branch));
-        return [
-            'name' => $branch_key,
-            'ref' => $branch,
-        ];
-    }, $branches);
-
-    return $result;
-}
-
 function get_branches() {
     $branch_commit_cache_file = get_branch_commit_cache_file_path();
     $branch_commit_map = [];
@@ -27,88 +21,45 @@ function get_branches() {
 
     $changed_branches = [];
     foreach (BRANCHES as $branch) {
-        $previous_commit_hash = $branch_commit_map[$branch] ?? null;
-        $current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch));
+        $previous_commit_hash = $branch_commit_map[$branch['ref']] ?? null;
+        $current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch['ref']));
 
         if ($previous_commit_hash !== $current_commit_hash) {
             $changed_branches[] = $branch;
         }
 
-        $branch_commit_map[$branch] = $current_commit_hash;
+        $branch_commit_map[$branch['ref']] = $current_commit_hash;
     }
 
     file_put_contents($branch_commit_cache_file, json_encode($branch_commit_map));
 
-    return get_branch_matrix($changed_branches);
+    return $changed_branches;
 }
 
-function get_matrix_include(array $branches) {
-    $jobs = [];
-    foreach ($branches as $branch) {
-        $jobs[] = [
-            'name' => '_ASAN_UBSAN',
-            'branch' => $branch,
-            'debug' => true,
-            '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[] = [
-                'name' => '_REPEAT',
-                'branch' => $branch,
-                '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,
-                'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
-                'run_tests_parameters' => '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0',
-                'timeout_minutes' => 360,
-                'test_function_jit' => true,
-            ];
-        }
-    }
-    return $jobs;
-}
-
-function get_windows_matrix_include(array $branches) {
-    $jobs = [];
-    foreach ($branches as $branch) {
-        $jobs[] = [
-            'branch' => $branch,
-            'x64' => true,
-            'zts' => true,
-            'opcache' => true,
-        ];
-        $jobs[] = [
-            'branch' => $branch,
-            'x64' => false,
-            'zts' => false,
-            'opcache' => false,
-        ];
-    }
-    return $jobs;
+function get_current_version(): array {
+    $file = dirname(__DIR__) . '/main/php_version.h';
+    $content = file_get_contents($file);
+    preg_match('(^#define PHP_MAJOR_VERSION (?<num>\d+)$)m', $content, $matches);
+    $major = (int) $matches['num'];
+    preg_match('(^#define PHP_MINOR_VERSION (?<num>\d+)$)m', $content, $matches);
+    $minor = (int) $matches['num'];
+    return [$major, $minor];
 }
 
 $trigger = $argv[1] ?? 'schedule';
 $attempt = (int) ($argv[2] ?? 1);
-$discard_cache = ($trigger === 'schedule' && $attempt !== 1) || $trigger === 'workflow_dispatch';
+$monday = date('w', time()) === '1';
+$discard_cache = $monday
+    || ($trigger === 'schedule' && $attempt !== 1)
+    || $trigger === 'workflow_dispatch';
 if ($discard_cache) {
     @unlink(get_branch_commit_cache_file_path());
 }
+$branch = $argv[3] ?? 'master';
+$branches = $branch === 'master'
+    ? get_branches()
+    : [['ref' => $branch, 'version' => get_current_version()]];
 
-$branches = get_branches();
-$matrix_include = get_matrix_include($branches);
-$windows_matrix_include = get_windows_matrix_include($branches);
-
-echo '::set-output name=branches::' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n";
-echo '::set-output name=matrix-include::' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n";
-echo '::set-output name=windows-matrix-include::' . json_encode($windows_matrix_include, JSON_UNESCAPED_SLASHES) . "\n";
+$f = fopen(getenv('GITHUB_OUTPUT'), 'a');
+fwrite($f, 'branches=' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n");
+fclose($f);

.github/scripts/windows/test_task.bat

@@ -103,7 +103,7 @@ mkdir %~d0\usr\local\share\enchant\hunspell
 if %errorlevel% neq 0 exit /b 3
 echo Fetching enchant dicts
 pushd %~d0\usr\local\share\enchant\hunspell
-powershell -Command wget http://windows.php.net/downloads/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
+powershell -Command wget https://downloads.php.net/~windows/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
 unzip dict.zip
 del /q dict.zip
 popd