Skip to content

Commit ce13272

Browse files
danogdanog
committed
Merge
2 parents d8997a5 + f093409 commit ce13272

File tree

719 files changed

+277187
-851
lines changed

Some content is hidden

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

719 files changed

+277187
-851
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ jobs:
111111
--enable-exif \
112112
--with-zip \
113113
--with-zlib \
114-
--with-zlib-dir=/usr \
115114
--enable-soap \
116115
--enable-xmlreader \
117116
--with-xsl \
@@ -177,6 +176,7 @@ jobs:
177176
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
178177
- run:
179178
name: Test
179+
no_output_timeout: 30m
180180
command: |
181181
sapi/cli/php run-tests.php \
182182
-d zend_extension=opcache.so \
@@ -185,10 +185,6 @@ jobs:
185185
-d opcache.jit_max_root_traces=100000 \
186186
-d opcache.jit_max_side_traces=100000 \
187187
-d opcache.jit_max_exit_counters=100000 \
188-
-d opcache.jit_hot_loop=1 \
189-
-d opcache.jit_hot_func=1 \
190-
-d opcache.jit_hot_return=1 \
191-
-d opcache.jit_hot_side_exit=1 \
192188
-d opcache.jit=tracing \
193189
-P -q -x -j2 \
194190
-g FAIL,BORK,LEAK,XLEAK \

‎.gitattributes‎

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

2828
# The OSS fuzz files are binary
2929
/ext/date/tests/ossfuzz*.txt binary
30+
31+
# Vendored libraries
32+
/ext/dom/lexbor/lexbor linguist-vendored

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ runs:
3131
export PDO_OCI_TEST_USER="system"
3232
export PDO_OCI_TEST_PASS="pass"
3333
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
34-
export PGSQL_TEST_CONNSTR="host=postgres dbname=test port=5432 user=postgres password=postgres"
35-
export PDO_PGSQL_TEST_DSN="host=postgres dbname=test port=5432 user=postgres password=postgres"
34+
export PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=postgres password=postgres"
35+
if [[ -z "$PDO_PGSQL_TEST_DSN" ]]; then
36+
export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres"
37+
fi
3638
export ODBC_TEST_USER="odbc_test"
3739
export ODBC_TEST_PASS="password"
3840
export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
@@ -48,10 +50,6 @@ runs:
4850
-d opcache.jit_max_root_traces=100000 \
4951
-d opcache.jit_max_side_traces=100000 \
5052
-d opcache.jit_max_exit_counters=100000 \
51-
-d opcache.jit_hot_loop=1 \
52-
-d opcache.jit_hot_func=1 \
53-
-d opcache.jit_hot_return=1 \
54-
-d opcache.jit_hot_side_exit=1 \
5553
-j$(/usr/bin/nproc) \
5654
-g FAIL,BORK,LEAK,XLEAK \
5755
--no-progress \

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ runs:
2727
-d opcache.jit_max_root_traces=100000 \
2828
-d opcache.jit_max_side_traces=100000 \
2929
-d opcache.jit_max_exit_counters=100000 \
30-
-d opcache.jit_hot_loop=1 \
31-
-d opcache.jit_hot_func=1 \
32-
-d opcache.jit_hot_return=1 \
33-
-d opcache.jit_hot_side_exit=1 \
3430
-j$(sysctl -n hw.ncpu) \
3531
-g FAIL,BORK,LEAK,XLEAK \
3632
--no-progress \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ set OPENSSL_CONF=
8383
rem set SSLEAY_CONF=
8484

8585
rem prepare for OPcache
86-
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_max_root_traces=100000 -d opcache.jit_max_side_traces=100000 -d opcache.jit_max_exit_counters=100000 -d opcache.jit_hot_loop=1 -d opcache.jit_hot_func=1 -d opcache.jit_hot_return=1 -d opcache.jit_hot_side_exit=1 -d opcache.jit=tracing --repeat 2
86+
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_max_root_traces=100000 -d opcache.jit_max_side_traces=100000 -d opcache.jit_max_exit_counters=100000 -d opcache.jit=tracing --repeat 2
8787
rem work-around for failing to dl(mysqli) with OPcache (https://github.com/php/php-src/issues/8508)
8888
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli
8989

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,8 @@ jobs:
6060
zts: [true, false]
6161
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
6262
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
63-
runs-on: ubuntu-${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
63+
runs-on: ubuntu-${{ ((matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && !matrix.asan) && '22.04' || '20.04' }}
6464
steps:
65-
# https://stackoverflow.com/a/76921482/1320374
66-
- name: Increase swapfile
67-
if: matrix.asan
68-
run: |
69-
sudo swapoff -a
70-
sudo fallocate -l 8G /swapfile
71-
sudo chmod 600 /swapfile
72-
sudo mkswap /swapfile
73-
sudo swapon /swapfile
74-
sudo swapon --show
7565
- name: git checkout
7666
uses: actions/checkout@v4
7767
with:
@@ -158,10 +148,6 @@ jobs:
158148
runs-on: ubuntu-latest
159149
container:
160150
image: ubuntu:${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
161-
env:
162-
MYSQL_TEST_HOST: mysql
163-
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
164-
PDO_MYSQL_TEST_HOST: mysql
165151
services:
166152
mysql:
167153
image: mysql:8

‎.github/workflows/push.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ jobs:
4848
services:
4949
mysql:
5050
image: mysql:8
51+
ports:
52+
- 3306:3306
5153
env:
5254
MYSQL_DATABASE: test
5355
MYSQL_ROOT_PASSWORD: root
5456
postgres:
5557
image: postgres
58+
ports:
59+
- 5432:5432
5660
env:
5761
POSTGRES_USER: postgres
5862
POSTGRES_PASSWORD: postgres
5963
POSTGRES_DB: test
60-
env:
61-
MYSQL_TEST_HOST: mysql
62-
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
63-
PDO_MYSQL_TEST_HOST: mysql
6464
strategy:
6565
fail-fast: false
6666
matrix:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,5 +295,6 @@ tmp-php.ini
295295
!/ext/fileinfo/libmagic/config.h
296296
!/ext/fileinfo/libmagic.patch
297297
!/ext/fileinfo/magicdata.patch
298+
!/ext/dom/lexbor/patches/*.patch
298299
!/ext/pcre/pcre2lib/config.h
299300
!/win32/build/Makefile

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ before_script:
8585

8686
# Run PHPs run-tests.php
8787
script:
88-
- travis_wait 60 ./travis/test.sh -d opcache.jit=tracing -d opcache.jit_buffer_size=64M -d opcache.jit_max_root_traces=100000 -d opcache.jit_max_side_traces=100000 -d opcache.jit_max_exit_counters=100000 -d opcache.jit_hot_loop=1 -d opcache.jit_hot_func=1 -d opcache.jit_hot_return=1 -d opcache.jit_hot_side_exit=1
88+
- travis_wait 60 ./travis/test.sh -d opcache.jit=tracing -d opcache.jit_buffer_size=64M -d opcache.jit_max_root_traces=100000 -d opcache.jit_max_side_traces=100000 -d opcache.jit_max_exit_counters=100000
8989
- sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
9090

9191
after_success:

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
/ext/mbstring @alexdowad
2525
/ext/opcache @dstogov @iluuu1994
2626
/ext/openssl @bukka
27+
/ext/pdo_pgsql @devnexen
2728
/ext/pgsql @devnexen
2829
/ext/random @TimWolla @zeriyoshi
2930
/ext/session @Girgias

0 commit comments

Comments
 (0)