Skip to content

Commit 63b1c52

Browse files
chopinschopins
authored
Merge pull request #29 from php/master
sync
2 parents d6d7bb8 + 6686068 commit 63b1c52

607 files changed

Lines changed: 12145 additions & 11693 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
arm:
55
resource_class: arm.medium
66
docker:
7-
- image: cimg/base:current-22.04
7+
- image: cimg/base:current-24.04
88
- image: mysql:8.3
99
environment:
1010
MYSQL_ALLOW_EMPTY_PASSWORD: true
@@ -60,7 +60,7 @@ jobs:
6060
libreadline-dev \
6161
libldap2-dev \
6262
libsodium-dev \
63-
libargon2-0-dev \
63+
libargon2-dev \
6464
libmm-dev \
6565
libsnmp-dev \
6666
snmpd \
@@ -78,7 +78,7 @@ jobs:
7878
libqdbm-dev \
7979
libjpeg-dev \
8080
libpng-dev \
81-
libfreetype6-dev
81+
libfreetype-dev
8282
- run:
8383
name: ./configure
8484
command: |

‎.github/actions/build-libmysqlclient/action.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ inputs:
55
required: false
66
libmysql:
77
required: true
8-
withMysqli:
9-
required: true
108
runs:
119
using: composite
1210
steps:
@@ -21,13 +19,11 @@ runs:
2119
wget -nv $URL
2220
tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
2321
PDO_MYSQL=${MYSQL_DIR}
24-
${{ inputs.withMysqli == 'true' && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' || '' }}
2522
./buildconf --force
2623
./configure ${{ inputs.configurationParameters }} \
2724
--enable-option-checking=fatal \
2825
--disable-all \
2926
--enable-pdo \
30-
--with-pdo-mysql=${PDO_MYSQL} \
31-
${{ inputs.withMysqli == 'true' && '--with-mysqli=${MYSQLI}' || '' }}
27+
--with-pdo-mysql=${PDO_MYSQL}
3228
make clean
3329
make -j$(/usr/bin/nproc) >/dev/null

‎.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:2022-CU14-ubuntu-22.04
14+
-d mcr.microsoft.com/mssql/server:2025-latest

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
name: Test libmysqlclient
2-
inputs:
3-
withMysqli:
4-
required: true
52
runs:
63
using: composite
74
steps:
85
- shell: bash
96
run: |
107
set -x
11-
${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_USER=root' || '' }}
12-
${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_PASSWD=root' || '' }}
138
export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
149
export PDO_MYSQL_TEST_HOST=127.0.0.1
1510
export PDO_MYSQL_TEST_USER=root

‎.github/nightly_matrix.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
['ref' => 'PHP-8.4', 'version' => [8, 4]],
77
['ref' => 'PHP-8.3', 'version' => [8, 3]],
88
['ref' => 'PHP-8.2', 'version' => [8, 2]],
9-
['ref' => 'PHP-8.1', 'version' => [8, 1]],
109
];
1110

1211
function get_branch_commit_cache_file_path(): string {

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ on:
1010
- docs/**
1111
jobs:
1212
pages:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-latest
1414
permissions:
1515
pages: write
1616
id-token: write
1717
if: github.repository == 'php/php-src'
1818
steps:
1919
- name: git checkout
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121
- name: Install dependencies
2222
run: pip install -r docs/requirements.txt
2323
- name: Check formatting

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
pull-requests: write
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/labeler@v5
15+
- uses: actions/labeler@v6
1616
with:
1717
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/nightly.yml‎

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ on:
1111
community_verify_type_inference:
1212
required: true
1313
type: boolean
14-
libmysqlclient_with_mysqli:
15-
required: true
16-
type: boolean
1714
macos_arm64_version:
1815
required: true
1916
type: string
@@ -60,7 +57,7 @@ jobs:
6057
runs-on: [self-hosted, gentoo, ppc64]
6158
steps:
6259
- name: git checkout
63-
uses: actions/checkout@v5
60+
uses: actions/checkout@v6
6461
with:
6562
ref: ${{ inputs.branch }}
6663
- name: System info
@@ -101,7 +98,7 @@ jobs:
10198
image: 'alpine:3.22'
10299
steps:
103100
- name: git checkout
104-
uses: actions/checkout@v5
101+
uses: actions/checkout@v6
105102
with:
106103
ref: ${{ inputs.branch }}
107104
- name: apk
@@ -202,7 +199,7 @@ jobs:
202199
runs-on: ubuntu-${{ matrix.asan && inputs.asan_ubuntu_version || inputs.ubuntu_version }}
203200
steps:
204201
- name: git checkout
205-
uses: actions/checkout@v5
202+
uses: actions/checkout@v6
206203
with:
207204
ref: ${{ inputs.branch }}
208205
- name: Create MSSQL container
@@ -297,7 +294,7 @@ jobs:
297294
FIREBIRD_PASSWORD: test
298295
steps:
299296
- name: git checkout
300-
uses: actions/checkout@v5
297+
uses: actions/checkout@v6
301298
with:
302299
ref: ${{ inputs.branch }}
303300
- name: apt
@@ -360,7 +357,7 @@ jobs:
360357
runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || inputs.macos_arm64_version }}
361358
steps:
362359
- name: git checkout
363-
uses: actions/checkout@v5
360+
uses: actions/checkout@v6
364361
with:
365362
ref: ${{ inputs.branch }}
366363
- name: Update clang
@@ -429,10 +426,10 @@ jobs:
429426
FIREBIRD_DATABASE: test.fdb
430427
FIREBIRD_USER: test
431428
FIREBIRD_PASSWORD: test
432-
runs-on: ubuntu-22.04
429+
runs-on: ubuntu-24.04
433430
steps:
434431
- name: git checkout
435-
uses: actions/checkout@v5
432+
uses: actions/checkout@v6
436433
with:
437434
ref: ${{ inputs.branch }}
438435
- name: Create MSSQL container
@@ -480,7 +477,7 @@ jobs:
480477
USE_TRACKED_ALLOC: 1
481478
steps:
482479
- name: git checkout
483-
uses: actions/checkout@v5
480+
uses: actions/checkout@v6
484481
with:
485482
ref: ${{ inputs.branch }}
486483
- name: apt
@@ -679,7 +676,7 @@ jobs:
679676
runs-on: ubuntu-${{ inputs.ubuntu_version }}
680677
steps:
681678
- name: git checkout
682-
uses: actions/checkout@v5
679+
uses: actions/checkout@v6
683680
with:
684681
ref: ${{ inputs.branch }}
685682
- name: Create MSSQL container
@@ -737,7 +734,7 @@ jobs:
737734
runs-on: ubuntu-${{ inputs.ubuntu_version }}
738735
steps:
739736
- name: git checkout
740-
uses: actions/checkout@v5
737+
uses: actions/checkout@v6
741738
with:
742739
ref: ${{ inputs.branch }}
743740
- name: apt
@@ -823,7 +820,7 @@ jobs:
823820
runs-on: ubuntu-${{ inputs.ubuntu_version }}
824821
steps:
825822
- name: git checkout
826-
uses: actions/checkout@v5
823+
uses: actions/checkout@v6
827824
with:
828825
ref: ${{ inputs.branch }}
829826
- name: apt
@@ -839,67 +836,59 @@ jobs:
839836
- name: Build mysql-8.0
840837
uses: ./.github/actions/build-libmysqlclient
841838
with:
842-
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
839+
configurationParameters: '--enable-werror'
843840
libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz
844-
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
845841
- name: Test mysql-8.0
846842
uses: ./.github/actions/test-libmysqlclient
847-
with:
848-
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
849843
- name: Build mysql-8.4
850-
if: ${{ !inputs.libmysqlclient_with_mysqli }}
851844
uses: ./.github/actions/build-libmysqlclient
852845
with:
853-
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
846+
configurationParameters: '--enable-werror'
854847
libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
855-
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
856848
- name: Test mysql-8.4
857-
if: ${{ !inputs.libmysqlclient_with_mysqli }}
858849
uses: ./.github/actions/test-libmysqlclient
859-
with:
860-
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
861850
- name: Verify generated files are up to date
862851
uses: ./.github/actions/verify-generated-files
863852
PECL:
864853
if: inputs.branch == 'master'
865-
runs-on: ubuntu-22.04
854+
runs-on: ubuntu-24.04
866855
env:
867856
CC: ccache gcc
868857
CXX: ccache g++
869858
steps:
870859
- name: git checkout PHP
871-
uses: actions/checkout@v5
860+
uses: actions/checkout@v6
872861
with:
873862
path: php
874863
ref: ${{ inputs.branch }}
875864
- name: git checkout apcu
876-
uses: actions/checkout@v5
865+
uses: actions/checkout@v6
877866
with:
878867
repository: krakjoe/apcu
879868
path: apcu
880869
- name: git checkout imagick
881-
uses: actions/checkout@v5
870+
uses: actions/checkout@v6
882871
with:
883872
repository: Imagick/imagick
884873
path: imagick
885874
- name: git checkout memcached
886-
uses: actions/checkout@v5
875+
uses: actions/checkout@v6
887876
with:
888877
repository: php-memcached-dev/php-memcached
889878
path: memcached
890879
- name: git checkout redis
891-
uses: actions/checkout@v5
880+
uses: actions/checkout@v6
892881
with:
893882
repository: phpredis/phpredis
894883
path: redis
895884
- name: git checkout xdebug
896885
if: false
897-
uses: actions/checkout@v5
886+
uses: actions/checkout@v6
898887
with:
899888
repository: xdebug/xdebug
900889
path: xdebug
901890
- name: git checkout yaml
902-
uses: actions/checkout@v5
891+
uses: actions/checkout@v6
903892
with:
904893
repository: php/pecl-file_formats-yaml
905894
path: yaml
@@ -909,6 +898,8 @@ jobs:
909898
sudo apt-get install -y --no-install-recommends \
910899
ccache \
911900
libmemcached-dev \
901+
imagemagick \
902+
libmagickwand-dev \
912903
bison \
913904
re2c
914905
- name: ccache
@@ -1004,7 +995,7 @@ jobs:
1004995
- name: git config
1005996
run: git config --global core.autocrlf false && git config --global core.eol lf
1006997
- name: git checkout
1007-
uses: actions/checkout@v5
998+
uses: actions/checkout@v6
1008999
with:
10091000
ref: ${{ inputs.branch }}
10101001
- name: Setup
@@ -1025,7 +1016,7 @@ jobs:
10251016
timeout-minutes: 50
10261017
steps:
10271018
- name: git checkout
1028-
uses: actions/checkout@v5
1019+
uses: actions/checkout@v6
10291020
with:
10301021
ref: ${{ inputs.branch }}
10311022
- name: FreeBSD

‎.github/workflows/push.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
image: 'alpine:3.22'
4141
steps:
4242
- name: git checkout
43-
uses: actions/checkout@v5
43+
uses: actions/checkout@v6
4444
- name: apk
4545
uses: ./.github/actions/apk
4646
- name: System info
@@ -115,7 +115,7 @@ jobs:
115115
timeout-minutes: 50
116116
steps:
117117
- name: git checkout
118-
uses: actions/checkout@v5
118+
uses: actions/checkout@v6
119119
- name: apt
120120
uses: ./.github/actions/apt-x64
121121
- name: System info
@@ -200,7 +200,7 @@ jobs:
200200
FIREBIRD_PASSWORD: test
201201
steps:
202202
- name: git checkout
203-
uses: actions/checkout@v5
203+
uses: actions/checkout@v6
204204
- name: apt
205205
uses: ./.github/actions/apt-x32
206206
- name: ccache
@@ -238,7 +238,7 @@ jobs:
238238
timeout-minutes: 50
239239
steps:
240240
- name: git checkout
241-
uses: actions/checkout@v5
241+
uses: actions/checkout@v6
242242
- name: Update clang
243243
uses: ./.github/actions/macos-update-clang
244244
- name: brew
@@ -287,7 +287,7 @@ jobs:
287287
- name: git config
288288
run: git config --global core.autocrlf false && git config --global core.eol lf
289289
- name: git checkout
290-
uses: actions/checkout@v5
290+
uses: actions/checkout@v6
291291
- name: Setup
292292
uses: ./.github/actions/setup-windows
293293
- name: Build
@@ -301,7 +301,7 @@ jobs:
301301
timeout-minutes: 50
302302
steps:
303303
- name: git checkout
304-
uses: actions/checkout@v5
304+
uses: actions/checkout@v6
305305
with:
306306
fetch-depth: 0
307307
# ASLR can cause a lot of noise due to missed sse opportunities for memcpy
@@ -363,7 +363,7 @@ jobs:
363363
mysql -uroot -proot -e "CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress'; FLUSH PRIVILEGES;"
364364
mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON *.* TO 'wordpress'@'localhost' WITH GRANT OPTION;"
365365
- name: git checkout benchmarking-data
366-
uses: actions/checkout@v5
366+
uses: actions/checkout@v6
367367
with:
368368
repository: php/benchmarking-data
369369
ssh-key: ${{ secrets.BENCHMARKING_DATA_DEPLOY_KEY }}
@@ -394,7 +394,7 @@ jobs:
394394
${{ github.sha }} \
395395
$(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.sha }}) \
396396
> $GITHUB_STEP_SUMMARY
397-
- uses: actions/upload-artifact@v4
397+
- uses: actions/upload-artifact@v6
398398
with:
399399
name: profiles
400400
path: ${{ github.workspace }}/benchmark/profiles
@@ -406,6 +406,6 @@ jobs:
406406
timeout-minutes: 50
407407
steps:
408408
- name: git checkout
409-
uses: actions/checkout@v5
409+
uses: actions/checkout@v6
410410
- name: FreeBSD
411411
uses: ./.github/actions/freebsd

0 commit comments

Comments
 (0)