Skip to content

Commit a01eb13

Browse files
lwlwilliamlwlwilliam
authored
Merge branch 'php:master' into my-master
2 parents 220acfc + e48099a commit a01eb13

170 files changed

Lines changed: 4804 additions & 1713 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.

‎.circleci/config.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ jobs:
9090
--prefix=/usr \
9191
--enable-phpdbg \
9292
--enable-fpm \
93-
--enable-opcache \
9493
--with-pdo-mysql=mysqlnd \
9594
--with-mysqli=mysqlnd \
9695
--with-pgsql \
@@ -168,7 +167,6 @@ jobs:
168167
no_output_timeout: 30m
169168
command: |
170169
sapi/cli/php run-tests.php \
171-
-d zend_extension=opcache.so \
172170
-d opcache.enable_cli=1 \
173171
-d opcache.jit_buffer_size=64M \
174172
-d opcache.jit=tracing \

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/.github @TimWolla
1818
/build/gen_stub.php @kocsismate
19-
/ext/bcmath @Girgias @nielsdos @SakiTakamachi
19+
/ext/bcmath @nielsdos @SakiTakamachi
2020
/ext/curl @adoy
2121
/ext/date @derickr
2222
/ext/dba @Girgias

‎.github/actions/apk/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+
OPCACHE_TLS_TESTS_DEPS="clang gcc binutils-gold lld"
10+
911
apk update -q
1012
apk add \
1113
util-linux \
@@ -53,4 +55,5 @@ runs:
5355
postgresql14-dev \
5456
tzdata \
5557
musl-locales \
56-
musl-locales-lang
58+
musl-locales-lang \
59+
$OPCACHE_TLS_TESTS_DEPS

‎.github/actions/apt-x32/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+
OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
10+
911
export DEBIAN_FRONTEND=noninteractive
1012
dpkg --add-architecture i386
1113
apt-get update -y | true
@@ -44,4 +46,5 @@ runs:
4446
re2c \
4547
unzip \
4648
wget \
47-
zlib1g-dev:i386
49+
zlib1g-dev:i386 \
50+
$OPCACHE_TLS_TESTS_DEPS

‎.github/actions/apt-x64/action.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ runs:
1010
run: |
1111
set -x
1212
13+
OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
14+
1315
export DEBIAN_FRONTEND=noninteractive
1416
1517
# Install sudo in Docker for consistent actions
@@ -74,4 +76,5 @@ runs:
7476
libqdbm-dev \
7577
libjpeg-dev \
7678
libpng-dev \
77-
libfreetype6-dev
79+
libfreetype6-dev \
80+
$OPCACHE_TLS_TESTS_DEPS

‎.github/actions/extra-tests/action.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: Extra tests
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: sh
6+
run: |
7+
sapi/cli/php run-extra-tests.php

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ inputs:
33
configurationParameters:
44
default: ''
55
required: false
6+
runExtraTests:
7+
default: false
8+
required: false
69
runs:
710
using: composite
811
steps:
@@ -17,6 +20,8 @@ runs:
1720
prepare: |
1821
cd $GITHUB_WORKSPACE
1922
23+
OPCACHE_TLS_TESTS_DEPS="gcc"
24+
2025
kldload accf_http
2126
pkg install -y \
2227
autoconf \
@@ -41,9 +46,11 @@ runs:
4146
webp \
4247
libavif \
4348
`#sqlite3` \
44-
curl
49+
curl \
50+
$OPCACHE_TLS_TESTS_DEPS
4551
4652
./buildconf -f
53+
CC=clang CXX=clang++ \
4754
./configure \
4855
--prefix=/usr/local \
4956
--enable-debug \
@@ -106,5 +113,8 @@ runs:
106113
--offline \
107114
--show-diff \
108115
--show-slow 1000 \
109-
--set-timeout 120 \
110-
-d zend_extension=opcache.so
116+
--set-timeout 120
117+
118+
if test "${{ inputs.runExtraTests }}" = "true"; then
119+
sapi/cli/php run-extra-tests.php
120+
fi

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ mkdir %PHP_BUILD_DIR%\test_file_cache
128128
rem generate php.ini
129129
echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
130130
echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini
131-
if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini
131+
echo opcache.record_warnings=1 >> %PHP_BUILD_DIR%\php.ini
132132
rem work-around for some spawned PHP processes requiring OpenSSL and sockets
133133
echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
134134
echo extension=php_sockets.dll >> %PHP_BUILD_DIR%\php.ini

‎.github/workflows/nightly.yml‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ jobs:
8585
with:
8686
runTestsParameters: >-
8787
--asan -x
88+
- name: Extra tests
89+
uses: ./.github/actions/extra-tests
8890
ALPINE:
8991
if: inputs.run_alpine
9092
name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
@@ -132,8 +134,9 @@ jobs:
132134
jitType: tracing
133135
runTestsParameters: >-
134136
--asan -x
135-
-d zend_extension=opcache.so
136137
-d opcache.enable_cli=1
138+
- name: Extra tests
139+
uses: ./.github/actions/extra-tests
137140
- name: Notify Slack
138141
if: failure()
139142
uses: ./.github/actions/notify-slack
@@ -246,14 +249,12 @@ jobs:
246249
jitType: tracing
247250
runTestsParameters: >-
248251
${{ matrix.run_tests_parameters }}
249-
-d zend_extension=opcache.so
250252
-d opcache.enable_cli=1
251253
- name: Test OpCache
252254
uses: ./.github/actions/test-linux
253255
with:
254256
runTestsParameters: >-
255257
${{ matrix.run_tests_parameters }}
256-
-d zend_extension=opcache.so
257258
-d opcache.enable_cli=1
258259
- name: Test Function JIT
259260
# ASAN frequently timeouts. Each test run takes ~90 minutes, we can
@@ -264,8 +265,9 @@ jobs:
264265
jitType: function
265266
runTestsParameters: >-
266267
${{ matrix.run_tests_parameters }}
267-
-d zend_extension=opcache.so
268268
-d opcache.enable_cli=1
269+
- name: Extra tests
270+
uses: ./.github/actions/extra-tests
269271
- name: Verify generated files are up to date
270272
uses: ./.github/actions/verify-generated-files
271273
- name: Notify Slack
@@ -338,23 +340,22 @@ jobs:
338340
jitType: tracing
339341
runTestsParameters: >-
340342
${{ matrix.run_tests_parameters }}
341-
-d zend_extension=opcache.so
342343
-d opcache.enable_cli=1
343344
- name: Test OpCache
344345
uses: ./.github/actions/test-linux
345346
with:
346347
runTestsParameters: >-
347348
${{ matrix.run_tests_parameters }}
348-
-d zend_extension=opcache.so
349349
-d opcache.enable_cli=1
350350
- name: Test Function JIT
351351
uses: ./.github/actions/test-linux
352352
with:
353353
jitType: function
354354
runTestsParameters: >-
355355
${{ matrix.run_tests_parameters }}
356-
-d zend_extension=opcache.so
357356
-d opcache.enable_cli=1
357+
- name: Extra tests
358+
uses: ./.github/actions/extra-tests
358359
- name: Notify Slack
359360
if: failure()
360361
uses: ./.github/actions/notify-slack
@@ -398,22 +399,21 @@ jobs:
398399
with:
399400
jitType: tracing
400401
runTestsParameters: >-
401-
-d zend_extension=opcache.so
402402
-d opcache.enable_cli=1
403403
- name: Test OpCache
404404
uses: ./.github/actions/test-macos
405405
with:
406406
runTestsParameters: >-
407-
-d zend_extension=opcache.so
408407
-d opcache.enable_cli=1
409408
- name: Test Function JIT
410409
if: matrix.os != '14' || !matrix.zts
411410
uses: ./.github/actions/test-macos
412411
with:
413412
jitType: function
414413
runTestsParameters: >-
415-
-d zend_extension=opcache.so
416414
-d opcache.enable_cli=1
415+
- name: Extra tests
416+
uses: ./.github/actions/extra-tests
417417
- name: Verify generated files are up to date
418418
uses: ./.github/actions/verify-generated-files
419419
- name: Notify Slack
@@ -474,7 +474,6 @@ jobs:
474474
with:
475475
jitType: tracing
476476
runTestsParameters: >-
477-
-d zend_extension=opcache.so
478477
-d opcache.enable_cli=1
479478
- uses: codecov/codecov-action@v4
480479
if: ${{ !cancelled() }}
@@ -528,7 +527,6 @@ jobs:
528527
- name: Enable Opcache
529528
run: |
530529
echo memory_limit=-1 >> /etc/php.d/opcache.ini
531-
echo zend_extension=opcache.so > /etc/php.d/opcache.ini
532530
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
533531
echo opcache.enable=1 >> /etc/php.d/opcache.ini
534532
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
@@ -719,37 +717,32 @@ jobs:
719717
uses: ./.github/actions/test-linux
720718
with:
721719
runTestsParameters: >-
722-
-d zend_extension=opcache.so
723720
-d opcache.enable_cli=1
724721
--file-cache-prime
725722
- name: Test File Cache (prime shm, use shm)
726723
uses: ./.github/actions/test-linux
727724
with:
728725
runTestsParameters: >-
729-
-d zend_extension=opcache.so
730726
-d opcache.enable_cli=1
731727
--file-cache-use
732728
- name: Test File Cache (prime shm, use file)
733729
uses: ./.github/actions/test-linux
734730
with:
735731
runTestsParameters: >-
736-
-d zend_extension=opcache.so
737732
-d opcache.enable_cli=1
738733
--file-cache-use
739734
-d opcache.file_cache_only=1
740735
- name: Test File Cache Only (prime)
741736
uses: ./.github/actions/test-linux
742737
with:
743738
runTestsParameters: >-
744-
-d zend_extension=opcache.so
745739
-d opcache.enable_cli=1
746740
--file-cache-prime
747741
-d opcache.file_cache_only=1
748742
- name: Test File Cache Only (use)
749743
uses: ./.github/actions/test-linux
750744
with:
751745
runTestsParameters: >-
752-
-d zend_extension=opcache.so
753746
-d opcache.enable_cli=1
754747
--file-cache-use
755748
-d opcache.file_cache_only=1
@@ -843,7 +836,6 @@ jobs:
843836
with:
844837
runTestsParameters: >-
845838
--msan
846-
-d zend_extension=opcache.so
847839
-d opcache.enable_cli=1
848840
- name: Verify generated files are up to date
849841
uses: ./.github/actions/verify-generated-files
@@ -1076,3 +1068,4 @@ jobs:
10761068
with:
10771069
configurationParameters: >-
10781070
--${{ matrix.zts && 'enable' || 'disable' }}-zts
1071+
runExtraTests: true

‎.github/workflows/push.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ jobs:
130130
with:
131131
jitType: tracing
132132
runTestsParameters: >-
133-
-d zend_extension=opcache.so
134133
-d opcache.enable_cli=1
135134
${{ matrix.asan && '--asan -x' || '' }}
136135
- name: Verify generated files are up to date
@@ -190,15 +189,14 @@ jobs:
190189
with:
191190
jitType: tracing
192191
runTestsParameters: >-
193-
-d zend_extension=opcache.so
194192
-d opcache.enable_cli=1
195193
MACOS_DEBUG_NTS:
196194
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
197195
strategy:
198196
fail-fast: false
199197
matrix:
200198
include:
201-
- os: 14
199+
- os: 15
202200
arch: ARM64
203201
name: MACOS_${{ matrix.arch }}_DEBUG_NTS
204202
runs-on: macos-${{ matrix.os }}
@@ -229,7 +227,6 @@ jobs:
229227
with:
230228
jitType: tracing
231229
runTestsParameters: >-
232-
-d zend_extension=opcache.so
233230
-d opcache.enable_cli=1
234231
- name: Verify generated files are up to date
235232
uses: ./.github/actions/verify-generated-files
@@ -299,7 +296,6 @@ jobs:
299296
./configure \
300297
--disable-debug \
301298
--enable-mbstring \
302-
--enable-opcache \
303299
--enable-option-checking=fatal \
304300
--enable-sockets \
305301
--enable-werror \
@@ -319,7 +315,6 @@ jobs:
319315
sudo mkdir -p /etc/php.d
320316
sudo chmod 777 /etc/php.d
321317
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
322-
echo zend_extension=opcache.so >> /etc/php.d/opcache.ini
323318
echo opcache.enable=1 >> /etc/php.d/opcache.ini
324319
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
325320
- name: Setup

0 commit comments

Comments
 (0)