Skip to content

Commit b95a837

Browse files
committed
Merge tag 'php-8.2.25' into was-8.2.x
Tag for php-8.2.25
2 parents b38e2c2 + 33657c0 commit b95a837

File tree

141 files changed

+2622
-774
lines changed

Some content is hidden

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

141 files changed

+2622
-774
lines changed

.cirrus.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ env:
33

44
freebsd_task:
55
name: FREEBSD_DEBUG_NTS
6+
skip: "changesIncludeOnly('NEWS', 'EXTENSIONS', 'UPGRADING', 'UPGRADING.INTERNALS', '**.md', 'docs/*', 'docs-old/*', '**/README.*', 'CONTRIBUTING.md', 'CODING_STANDARDS.md')"
67
freebsd_instance:
78
image_family: freebsd-13-3
89
env:

.github/CODEOWNERS

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# For more information, see the GitHub CODEOWNERS documentation:
1515
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
1616

17-
/.github @iluuu1994 @TimWolla
17+
/.github @TimWolla
1818
/build/gen_stub.php @kocsismate
1919
/ext/bcmath @Girgias @nielsdos @SakiTakamachi
2020
/ext/curl @adoy
@@ -32,7 +32,7 @@
3232
/ext/mbstring @alexdowad @youkidearitai
3333
/ext/mysqlnd @SakiTakamachi
3434
/ext/odbc @NattyNarwhal
35-
/ext/opcache @dstogov @iluuu1994
35+
/ext/opcache @dstogov
3636
/ext/openssl @bukka
3737
/ext/pcntl @devnexen
3838
/ext/pdo @SakiTakamachi
@@ -55,26 +55,24 @@
5555
/ext/xsl @nielsdos
5656
/main @bukka
5757
/sapi/fpm @bukka
58-
/Zend/Optimizer @dstogov @iluuu1994
58+
/Zend/Optimizer @dstogov
5959
/Zend/zend.* @dstogov
6060
/Zend/zend_alloc.* @dstogov
61-
/Zend/zend_API.* @dstogov @iluuu1994
61+
/Zend/zend_API.* @dstogov
6262
/Zend/zend_call_stack.* @arnaud-lb
6363
/Zend/zend_closures.* @dstogov
64-
/Zend/zend_compile.* @iluuu1994
65-
/Zend/zend_enum.* @iluuu1994
66-
/Zend/zend_execute.* @dstogov @iluuu1994
67-
/Zend/zend_execute_API.c @dstogov @iluuu1994
64+
/Zend/zend_execute.* @dstogov
65+
/Zend/zend_execute_API.c @dstogov
6866
/Zend/zend_gc.* @dstogov @arnaud-lb
6967
/Zend/zend_hash.* @dstogov
70-
/Zend/zend_inheritance.* @dstogov @iluuu1994
68+
/Zend/zend_inheritance.* @dstogov
7169
/Zend/zend_max_execution_timer.* @arnaud-lb
72-
/Zend/zend_object_handlers.* @dstogov @iluuu1994
73-
/Zend/zend_objects.* @dstogov @iluuu1994
74-
/Zend/zend_objects_API.* @dstogov @iluuu1994
75-
/Zend/zend_opcode.* @dstogov @iluuu1994
70+
/Zend/zend_object_handlers.* @dstogov
71+
/Zend/zend_objects.* @dstogov
72+
/Zend/zend_objects_API.* @dstogov
73+
/Zend/zend_opcode.* @dstogov
7674
/Zend/zend_string.* @dstogov
77-
/Zend/zend_type*.h @dstogov @iluuu1994
75+
/Zend/zend_type*.h @dstogov
7876
/Zend/zend_variables.* @dstogov
79-
/Zend/zend_vm* @dstogov @iluuu1994
77+
/Zend/zend_vm* @dstogov
8078
*.stub.php @kocsismate

.github/actions/brew/action.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,15 @@ runs:
1212
sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
1313
1414
brew install \
15-
pkg-config \
16-
autoconf \
1715
bison \
1816
re2c
1917
brew install \
20-
21-
curl \
22-
krb5 \
2318
bzip2 \
2419
enchant \
2520
libffi \
26-
libpng \
27-
webp \
28-
freetype \
2921
intltool \
30-
icu4c \
3122
libiconv \
32-
zlib \
3323
t1lib \
34-
gd \
35-
libzip \
36-
gmp \
37-
tidy-html5 \
3824
libxml2 \
3925
libjpeg \
40-
libxslt \
41-
postgresql
42-
brew link icu4c gettext --force
26+
libxslt

.github/actions/setup-mssql/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ runs:
1111
-p 1433:1433 \
1212
--name sql1 \
1313
-h sql1 \
14-
-d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04
14+
-d mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@ runs:
66
run: |
77
set -x
88
9-
sudo service mysql start
10-
sudo service postgresql start
119
sudo service slapd start
12-
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
13-
# Ensure local_infile tests can run.
14-
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
15-
sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
16-
sudo -u postgres psql -c "CREATE DATABASE test;"
17-
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
10+
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
1811
sudo locale-gen de_DE
1912
2013
./.github/scripts/setup-slapd.sh

.github/labeler.yml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,93 @@
241241

242242
"SAPI: phpdbg":
243243
- sapi/phpdbg/**/*
244+
245+
"ABI break":
246+
- 'TSRM/*.h'
247+
- 'Zend/*.h'
248+
- 'Zend/Optimizer/zend_call_graph.h'
249+
- 'Zend/Optimizer/zend_cfg.h'
250+
- 'Zend/Optimizer/zend_dump.h'
251+
- 'Zend/Optimizer/zend_func_info.h'
252+
- 'Zend/Optimizer/zend_inference.h'
253+
- 'Zend/Optimizer/zend_optimizer.h'
254+
- 'Zend/Optimizer/zend_ssa.h'
255+
- 'ext/curl/php_curl.h'
256+
- 'ext/date/lib/timelib.h'
257+
- 'ext/date/lib/timelib_config.h'
258+
- 'ext/date/php_date.h'
259+
- 'ext/dom/xml_common.h'
260+
- 'ext/filter/php_filter.h'
261+
- 'ext/gd/*.h'
262+
- 'ext/gd/libgd/*.h'
263+
- 'ext/gmp/php_gmp_int.h'
264+
- 'ext/hash/php_hash.h'
265+
- 'ext/hash/php_hash_adler32.h'
266+
- 'ext/hash/php_hash_crc32.h'
267+
- 'ext/hash/php_hash_gost.h'
268+
- 'ext/hash/php_hash_haval.h'
269+
- 'ext/hash/php_hash_md.h'
270+
- 'ext/hash/php_hash_murmur.h'
271+
- 'ext/hash/php_hash_ripemd.h'
272+
- 'ext/hash/php_hash_sha.h'
273+
- 'ext/hash/php_hash_sha3.h'
274+
- 'ext/hash/php_hash_snefru.h'
275+
- 'ext/hash/php_hash_tiger.h'
276+
- 'ext/hash/php_hash_whirlpool.h'
277+
- 'ext/hash/php_hash_xxhash.h'
278+
- 'ext/iconv/*.h'
279+
- 'ext/json/php_json.h'
280+
- 'ext/json/php_json_parser.h'
281+
- 'ext/json/php_json_scanner.h'
282+
- 'ext/libxml/php_libxml.h'
283+
- 'ext/mbstring/libmbfl/config.h'
284+
- 'ext/mbstring/libmbfl/mbfl/eaw_table.h'
285+
- 'ext/mbstring/libmbfl/mbfl/mbfilter.h'
286+
- 'ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h'
287+
- 'ext/mbstring/libmbfl/mbfl/mbfilter_pass.h'
288+
- 'ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h'
289+
- 'ext/mbstring/libmbfl/mbfl/mbfl_consts.h'
290+
- 'ext/mbstring/libmbfl/mbfl/mbfl_convert.h'
291+
- 'ext/mbstring/libmbfl/mbfl/mbfl_defs.h'
292+
- 'ext/mbstring/libmbfl/mbfl/mbfl_encoding.h'
293+
- 'ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h'
294+
- 'ext/mbstring/libmbfl/mbfl/mbfl_language.h'
295+
- 'ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h'
296+
- 'ext/mbstring/libmbfl/mbfl/mbfl_string.h'
297+
- 'ext/mbstring/mbstring.h'
298+
- 'ext/mbstring/php_mbregex.h'
299+
- 'ext/mbstring/php_onig_compat.h'
300+
- 'ext/mysqli/php_mysqli_structs.h'
301+
- 'ext/mysqlnd/*.h'
302+
- 'ext/pcre/pcre2lib/*.h'
303+
- 'ext/pcre/php_pcre.h'
304+
- 'ext/pdo/php_pdo.h'
305+
- 'ext/pdo/php_pdo_driver.h'
306+
- 'ext/pdo/php_pdo_error.h'
307+
- 'ext/random/php_random.h'
308+
- 'ext/session/mod_files.h'
309+
- 'ext/session/mod_mm.h'
310+
- 'ext/session/mod_user.h'
311+
- 'ext/session/php_session.h'
312+
- 'ext/simplexml/php_simplexml.h'
313+
- 'ext/simplexml/php_simplexml_exports.h'
314+
- 'ext/sockets/php_sockets.h'
315+
- 'ext/sockets/windows_common.h'
316+
- 'ext/sodium/php_libsodium.h'
317+
- 'ext/spl/php_spl.h'
318+
- 'ext/spl/spl_array.h'
319+
- 'ext/spl/spl_directory.h'
320+
- 'ext/spl/spl_dllist.h'
321+
- 'ext/spl/spl_engine.h'
322+
- 'ext/spl/spl_exceptions.h'
323+
- 'ext/spl/spl_fixedarray.h'
324+
- 'ext/spl/spl_functions.h'
325+
- 'ext/spl/spl_heap.h'
326+
- 'ext/spl/spl_iterators.h'
327+
- 'ext/spl/spl_observer.h'
328+
- 'ext/standard/*.h'
329+
- 'ext/xml/*.h'
330+
- 'main/*.h'
331+
- 'main/streams/*.h'
332+
- 'sapi/embed/php_embed.h'
333+
- 'win32/*.h'

.github/scripts/windows/test_task.bat

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,12 @@ set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXP
5252
set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
5353

5454
rem setup Firebird related exts
55-
curl -sLo Firebird.zip https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
55+
if "%PLATFORM%" == "x64" (
56+
set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
57+
) else (
58+
set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_Win32.zip
59+
)
60+
curl -sLo Firebird.zip %PHP_FIREBIRD_DOWNLOAD_URL%
5661
7z x -oC:\Firebird Firebird.zip
5762
set PDO_FIREBIRD_TEST_DATABASE=C:\test.fdb
5863
set PDO_FIREBIRD_TEST_DSN=firebird:dbname=%PDO_FIREBIRD_TEST_DATABASE%
@@ -105,7 +110,7 @@ popd
105110

106111
rem prepare for snmp
107112
set MIBDIRS=%DEPS_DIR%\share\mibs
108-
start %DEPS_DIR%\bin\snmpd.exe -C -c %APPVEYOR_BUILD_FOLDER%\ext\snmp\tests\snmpd.conf -Ln
113+
start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln
109114

110115
set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
111116
if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS

.github/workflows/nightly.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,20 @@ jobs:
3939
LINUX_X64:
4040
needs: GENERATE_MATRIX
4141
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
42+
services:
43+
mysql:
44+
image: mysql:8.3
45+
ports:
46+
- 3306:3306
47+
env:
48+
MYSQL_DATABASE: test
49+
MYSQL_ROOT_PASSWORD: root
50+
postgres:
51+
image: postgres
52+
env:
53+
POSTGRES_USER: postgres
54+
POSTGRES_PASSWORD: postgres
55+
POSTGRES_DB: test
4256
strategy:
4357
fail-fast: false
4458
matrix:
@@ -255,6 +269,20 @@ jobs:
255269
COVERAGE_DEBUG_NTS:
256270
if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
257271
runs-on: ubuntu-20.04
272+
services:
273+
mysql:
274+
image: mysql:8.3
275+
ports:
276+
- 3306:3306
277+
env:
278+
MYSQL_DATABASE: test
279+
MYSQL_ROOT_PASSWORD: root
280+
postgres:
281+
image: postgres
282+
env:
283+
POSTGRES_USER: postgres
284+
POSTGRES_PASSWORD: postgres
285+
POSTGRES_DB: test
258286
steps:
259287
- name: git checkout
260288
uses: actions/checkout@v4
@@ -414,6 +442,20 @@ jobs:
414442
OPCACHE_VARIATION:
415443
needs: GENERATE_MATRIX
416444
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
445+
services:
446+
mysql:
447+
image: mysql:8.3
448+
ports:
449+
- 3306:3306
450+
env:
451+
MYSQL_DATABASE: test
452+
MYSQL_ROOT_PASSWORD: root
453+
postgres:
454+
image: postgres
455+
env:
456+
POSTGRES_USER: postgres
457+
POSTGRES_PASSWORD: postgres
458+
POSTGRES_DB: test
417459
strategy:
418460
fail-fast: false
419461
matrix:

.github/workflows/push.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,22 @@ env:
4343
jobs:
4444
LINUX_X64:
4545
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
46+
services:
47+
mysql:
48+
image: mysql:8.3
49+
ports:
50+
- 3306:3306
51+
env:
52+
MYSQL_DATABASE: test
53+
MYSQL_ROOT_PASSWORD: root
54+
postgres:
55+
image: postgres
56+
ports:
57+
- 5432:5432
58+
env:
59+
POSTGRES_USER: postgres
60+
POSTGRES_PASSWORD: postgres
61+
POSTGRES_DB: test
4662
strategy:
4763
fail-fast: false
4864
matrix:

0 commit comments

Comments
 (0)