Skip to content

Commit c1c87bb

Browse files
committed
[ci skip] Merge branch 'PHP-8.4' into fix-gh8739-zts
* PHP-8.4: (262 commits) Fix GH-25474: version_compare() numeric parts overflow long on Windows (#25475) ext/session: prevent creation of fixed sid in php_session_rfc1867 (GH-22113) Forbid \C in patterns enabling UTF mode with (*UTF) (GH-25452) Fix GH-24743: var_export() ignores exception from lazy object init (#24746) ext/snmp: Copy the context name in SNMP::setSecurity() Fix GH-25434: C14NFile() skips namespace relinking on success Fix uploaded files leak in request_parse_body() (#25387) Fix GH-25094: NULL dereference in SOAP get_doc_function() with missing parts Pin Linux x86 CI to Ubuntu 24.04 (#25416) Fix GH-25359: tracing JIT drops reference type of a named by-ref argument Fix AST export of by-reference property hooks (GH-25069) fix test when tmp-php.ini is used Fix stack overflow in filter_var() and filter_var_array() (#25349) Align the Windows OPcache JIT buffer (#25262) Fix GH-25311: Assertion ret == SUCCESS in array_map()/array_filter() after delayed out-of-memory Fix tracing JIT reading the int result of ++/-- on a reference as a double Fix error buffer cleanup in phar_open_parsed_phar() (#25376) Fix GH-25306: Assertion status == LXB_STATUS_OK in dom_parse_selector when lexbor allocation fails Fix AST printing dropping readonly on promoted parameters (GH-25207) ext/gd: blame the points array when a polygon has too few points ...
2 parents 1e0b58f + de5c604 commit c1c87bb

846 files changed

Lines changed: 124444 additions & 3263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@
3131

3232
# Vendored libraries
3333
/ext/dom/lexbor/lexbor linguist-vendored
34+
35+
# The phar has some binary
36+
/pear/install-pear-nozlib.phar binary

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
/ext/pgsql @devnexen
4646
/ext/phar @LamentXU123
4747
/ext/random @TimWolla @zeriyoshi
48+
/ext/readline @LamentXU123
4849
/ext/reflection @DanielEScherzer
4950
/ext/session @Girgias @jorgsowa
5051
/ext/simplexml @devnexen

‎.github/actions/brew/action.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ runs:
66
run: |
77
set -x
88
9+
brew update
10+
911
# Patch brew to overwrite always
1012
formula_installer="$(brew --repo)"/Library/Homebrew/formula_installer.rb
1113
code=" keg.link\(verbose: verbose\?"
@@ -32,4 +34,5 @@ runs:
3234
t1lib \
3335
libxml2 \
3436
libjpeg \
35-
libxslt
37+
libxslt \
38+
openssl@3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
set -x
1212
BREW_OPT="$(brew --prefix)"/opt
1313
export PATH="$BREW_OPT/bison/bin:$PATH"
14-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/openssl/lib/pkgconfig"
14+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/openssl@3/lib/pkgconfig"
1515
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/curl/lib/pkgconfig"
1616
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libffi/lib/pkgconfig"
1717
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/lib/pkgconfig"

‎.github/actions/freebsd/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
- name: FreeBSD
1313
uses: vmactions/freebsd-vm@v1
1414
with:
15-
release: '13.5'
15+
release: '14.4'
1616
usesh: true
1717
copyback: false
1818
disable-cache: true

‎.github/actions/setup-windows/action.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ runs:
1111
mysql --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
1212
- name: Setup MSSQL
1313
shell: pwsh
14-
run: |
15-
choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
14+
run: .github/scripts/windows/setup-mssql.ps1
1615
- name: Setup PostgreSQL
1716
shell: pwsh
1817
run: |

‎.github/matrix.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,9 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
125125
: ['debug' => [true], 'zts' => [true]];
126126
}
127127
if ($all_jobs || !$no_jobs || $test_macos) {
128-
$test_arm = version_compare($php_version, '8.4', '>=');
129128
$jobs['MACOS']['matrix'] = $all_variations
130-
? ['arch' => $test_arm ? ['X64', 'ARM64'] : ['X64'], 'debug' => [true, false], 'zts' => [true, false]]
131-
: ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false]]];
129+
? ['arch' => ['ARM64'], 'debug' => [true, false], 'zts' => [true, false]]
130+
: ['include' => [['arch' => 'ARM64', 'debug' => true, 'zts' => false]]];
132131
$jobs['MACOS']['config']['version'] = version_compare($php_version, '8.4', '>=') ? '26' : '15';
133132
}
134133
if ($all_jobs || $test_msan) {
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# https://learn.microsoft.com/en-us/troubleshoot/sql/azure-sql/sql-installation-fails-sector-size-error-azure-vm
2+
$ErrorActionPreference = 'Stop'
3+
4+
$compatibleDrives = foreach ($driveLetter in 'C', 'D') {
5+
if (!(Test-Path "${driveLetter}:\")) {
6+
continue
7+
}
8+
try {
9+
$disk = Get-Partition -DriveLetter $driveLetter | Get-Disk
10+
} catch {
11+
Write-Warning "Cannot determine the sector size of ${driveLetter}: $_"
12+
continue
13+
}
14+
if ($disk.PhysicalSectorSize -in @(512, 4096)) {
15+
$driveLetter
16+
}
17+
}
18+
$driveLetter = $compatibleDrives | Select-Object -First 1
19+
if (!$driveLetter) {
20+
throw 'Neither C: nor D: has a SQL Server-compatible physical sector size (512 or 4096 bytes).'
21+
}
22+
$installDir = "${driveLetter}:\SQLServer"
23+
Write-Host "Installing SQL Server in $installDir"
24+
25+
$delay = 3
26+
for ($attempt = 1; $attempt -le 3; $attempt++) {
27+
choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12! /INSTANCEDIR=$installDir /INSTALLSQLDATADIR=$installDir"
28+
$exitCode = $LASTEXITCODE
29+
if ($exitCode -eq 0) {
30+
exit 0
31+
}
32+
if ($exitCode -notin @(-1, 1, 404) -or (Test-Path $installDir) -or $attempt -eq 3) {
33+
exit $exitCode
34+
}
35+
Write-Host "Retrying SQL Server setup in $delay seconds..."
36+
Start-Sleep -Seconds $delay
37+
$delay *= 2
38+
}

‎.github/scripts/windows/test_task.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,12 @@ set OPENSSL_CONF=
9090
rem set SSLEAY_CONF=
9191

9292
rem prepare for OPcache
93+
set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
94+
if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
95+
9396
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit=tracing
9497
rem work-around for failing to dl(mysqli) with OPcache (https://github.com/php/php-src/issues/8508)
95-
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli
98+
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli -d extension_dir=%PHP_BUILD_DIR%
9699

97100
rem prepare for enchant
98101
mkdir %~d0\usr\local\lib\enchant-2
@@ -113,9 +116,6 @@ set MIBDIRS=%DEPS_DIR%\share\mibs
113116
sed -i "s/exec HexTest .*/exec HexTest cscript\.exe \/nologo %GITHUB_WORKSPACE:\=\/%\/ext\/snmp\/tests\/bigtest\.js/g" %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf
114117
start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln
115118

116-
set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
117-
if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
118-
119119
rem prepare for mail
120120
curl -sLo hMailServer.zip https://downloads.php.net/~windows/php-sdk/deps/vs18/x64/hmailserver-5.7.0-vs18-x64.zip
121121
unzip -q hMailServer.zip -d hMailServer

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'php/php-src'
1818
steps:
1919
- name: git checkout
20-
uses: actions/checkout@v6
20+
uses: actions/checkout@v7
2121
- name: Install dependencies
2222
run: pip install sphinx-design sphinxawesome-theme rstfmt
2323
- name: Check formatting

0 commit comments

Comments
 (0)