Skip to content

Commit faec711

Browse files
committed
Merge branch 'master' into true-async
# Conflicts: # ext/openssl/xp_ssl.c # main/streams/xp_socket.c
2 parents 3e113d4 + 1ee8dfd commit faec711

File tree

1,070 files changed

+43105
-43939
lines changed

Some content is hidden

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

1,070 files changed

+43105
-43939
lines changed

.gdbinit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ define print_cvs
4242

4343
printf "Compiled variables count: %d\n\n", $cv_count
4444
while $cv_idx < $cv_count
45-
printf "[%d] '%s'\n", $cv_idx, $cv[$cv_idx].val
45+
printf "[%d] '$%s'\n", $cv_idx, $cv[$cv_idx].val@$cv[$cv_idx].len
4646
set $zvalue = ((zval *) $cv_ex_ptr) + $callFrameSize + $cv_idx
4747
printzv $zvalue
4848
set $cv_idx = $cv_idx + 1

.github/CODEOWNERS

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
/.github @TimWolla
1818
/build/gen_stub.php @kocsismate
19-
/ext/bcmath @nielsdos @SakiTakamachi
19+
/ext/bcmath @ndossche @SakiTakamachi
2020
/ext/curl @adoy
2121
/ext/date @derickr
2222
/ext/dba @Girgias
23-
/ext/dom @nielsdos
23+
/ext/dom @ndossche
2424
/ext/ffi @dstogov
2525
/ext/gd @devnexen
2626
/ext/gettext @devnexen
2727
/ext/gmp @Girgias
2828
/ext/intl @devnexen
2929
/ext/json @bukka
30-
/ext/lexbor @kocsismate @nielsdos
31-
/ext/libxml @nielsdos
30+
/ext/lexbor @kocsismate @ndossche
31+
/ext/libxml @ndossche
3232
/ext/mbstring @alexdowad @youkidearitai
3333
/ext/mysqli @bukka @kamil-tekiela
3434
/ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
@@ -47,16 +47,17 @@
4747
/ext/random @TimWolla @zeriyoshi
4848
/ext/reflection @DanielEScherzer
4949
/ext/session @Girgias
50-
/ext/simplexml @nielsdos
51-
/ext/soap @nielsdos
50+
/ext/simplexml @ndossche
51+
/ext/soap @ndossche
5252
/ext/sockets @devnexen
5353
/ext/spl @Girgias
5454
/ext/standard @bukka
55-
/ext/uri @kocsismate
56-
/ext/xml @nielsdos
57-
/ext/xmlreader @nielsdos
58-
/ext/xmlwriter @nielsdos
59-
/ext/xsl @nielsdos
55+
/ext/tidy @ndossche
56+
/ext/uri @kocsismate @TimWolla
57+
/ext/xml @ndossche
58+
/ext/xmlreader @ndossche
59+
/ext/xmlwriter @ndossche
60+
/ext/xsl @ndossche
6061
/main @bukka
6162
/sapi/fpm @bukka
6263
/Zend/Optimizer @dstogov

.github/actions/apk/action.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ runs:
77
set -x
88
99
OPCACHE_TLS_TESTS_DEPS="clang gcc binutils-gold lld"
10+
# compiler-rt provides libclang_rt.asan-x86_64.a for clang20
11+
# https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.22
12+
ASAN_DEPS="clang20 compiler-rt"
1013
1114
apk update -q
1215
apk add \
@@ -52,8 +55,9 @@ runs:
5255
net-snmp-dev \
5356
openldap-dev \
5457
unixodbc-dev \
55-
postgresql14-dev \
58+
postgresql-dev \
5659
tzdata \
5760
musl-locales \
5861
musl-locales-lang \
59-
$OPCACHE_TLS_TESTS_DEPS
62+
$OPCACHE_TLS_TESTS_DEPS \
63+
$ASAN_DEPS
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: ./configure (unit tests)
2+
description: Configure PHP with minimal settings for unit testing
3+
runs:
4+
using: composite
5+
steps:
6+
- shell: bash
7+
run: |
8+
set -x
9+
./buildconf --force
10+
./configure --disable-all --enable-embed=static

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

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/actions/verify-generated-files/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ runs:
1212
Zend/zend_vm_gen.php
1313
ext/tokenizer/tokenizer_data_gen.php
1414
build/gen_stub.php -f --generate-optimizer-info --verify
15-
# Use the -a flag for a bug in git 2.46.0, which doesn't consider changed -diff files.
16-
git add . -N && git diff -a --exit-code
15+
ext/phar/makestub.php
16+
.github/scripts/test-directory-unchanged.sh .

.github/nightly_matrix.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ function get_current_version(): array {
4949

5050
$trigger = $argv[1] ?? 'schedule';
5151
$attempt = (int) ($argv[2] ?? 1);
52-
$monday = date('w', time()) === '1';
53-
$discard_cache = $monday
52+
$sunday = date('w', time()) === '0';
53+
$discard_cache = $sunday
5454
|| ($trigger === 'schedule' && $attempt !== 1)
5555
|| $trigger === 'workflow_dispatch';
5656
if ($discard_cache) {
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/sh
2+
set -ex
3+
cd "$(dirname "$0")/../../.."
4+
5+
revision=refs/tags/pcre2-10.44
6+
7+
git clone --depth 1 --recurse-submodules --revision="$revision" https://github.com/PCRE2Project/pcre2.git /tmp/php-src-bundled/pcre2
8+
9+
rm -rf ext/pcre/pcre2lib
10+
cp -R /tmp/php-src-bundled/pcre2/src ext/pcre/pcre2lib
11+
12+
cd ext/pcre/pcre2lib
13+
14+
# remove unneeded files
15+
rm config.h.generic
16+
rm pcre2.h.in
17+
rm pcre2_dftables.c
18+
rm pcre2_fuzzsupport.c
19+
rm pcre2_jit_test.c
20+
rm pcre2demo.c
21+
rm pcre2grep.c
22+
rm pcre2posix.c
23+
rm pcre2posix.h
24+
rm pcre2posix_test.c
25+
rm pcre2test.c
26+
27+
# move renamed files
28+
mv pcre2.h.generic pcre2.h
29+
mv pcre2_chartables.c.dist pcre2_chartables.c
30+
31+
# add extra files
32+
git restore config.h # based on config.h.generic but with many changes
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
set -ex
3+
4+
cd "$(dirname "$0")/../../$1"
5+
6+
# notify git about untracked (except ignored) files
7+
git add -N .
8+
9+
# display overview of changed files
10+
git status .
11+
12+
# display diff of working directory vs HEAD commit and set exit code
13+
git diff -a --exit-code HEAD .

.github/scripts/windows/test_task.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ if %errorlevel% neq 0 exit /b 3
3636
rem setup PostgreSQL related exts
3737
set PGUSER=postgres
3838
set PGPASSWORD=Password12!
39-
rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
40-
echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> "./ext/pgsql/tests/config.inc"
39+
set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%
4140
set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
4241
set TMP_POSTGRESQL_BIN=%PGBIN%
4342
"%TMP_POSTGRESQL_BIN%\createdb.exe" test

0 commit comments

Comments
 (0)