Skip to content

Commit 61c13b0

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19243 from MauricioFauth/php82
Bump minimum PHP version to 8.2.0
2 parents 238de3a + b1ae10d commit 61c13b0

16 files changed

Lines changed: 91 additions & 161 deletions

‎.github/workflows/daily-snapshots.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
include:
2424
- { version: '5.2', branch: 'QA_5_2', php-version: '7.2', node-version: '12', python-version: '3.7' }
25-
- { version: '6.0', branch: 'master', php-version: '8.1', node-version: '16', python-version: '3.7' }
25+
- { version: '6.0', branch: 'master', php-version: '8.2', node-version: '16', python-version: '3.7' }
2626
steps:
2727
- name: Check out code
2828
uses: actions/checkout@v4

‎.github/workflows/lint-and-analyse-php.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
php-version: ["8.1"]
19+
php-version: ["8.2"]
2020
steps:
2121
- name: Checkout code
2222
uses: actions/checkout@v4
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565
strategy:
6666
matrix:
67-
php-version: ["8.1"]
67+
php-version: ["8.2"]
6868
steps:
6969
- name: Checkout code
7070
uses: actions/checkout@v4

‎.github/workflows/other-tools.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
strategy:
3030
matrix:
31-
php-version: ["8.1"]
31+
php-version: ["8.2"]
3232
steps:
3333
- name: Checkout code
3434
uses: actions/checkout@v4

‎.github/workflows/test-selenium.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
contents: read
1313

1414
env:
15-
php-version: "8.1"
15+
php-version: "8.2"
1616

1717
jobs:
1818
selenium:

‎.github/workflows/tests.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- { php-version: '81', experimental: false, arch: 'amd64', exclude-phpunit-groups: 'extension-iconv' }
24-
- { php-version: '81', experimental: false, arch: 'arm64v8', exclude-phpunit-groups: 'extension-iconv' }
25-
- { php-version: '81', experimental: false, arch: 'arm32v7', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
26-
- { php-version: '81', experimental: false, arch: 'i386', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
27-
- { php-version: '81', experimental: true, arch: 'ppc64le', exclude-phpunit-groups: 'extension-iconv' }
28-
- { php-version: '81', experimental: false, arch: 's390x', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
23+
- { php-version: '82', experimental: false, arch: 'amd64', exclude-phpunit-groups: 'extension-iconv' }
24+
- { php-version: '82', experimental: false, arch: 'arm64v8', exclude-phpunit-groups: 'extension-iconv' }
25+
- { php-version: '82', experimental: false, arch: 'arm32v7', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
26+
- { php-version: '82', experimental: false, arch: 'i386', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
27+
- { php-version: '82', experimental: true, arch: 'ppc64le', exclude-phpunit-groups: 'extension-iconv' }
28+
- { php-version: '82', experimental: false, arch: 's390x', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
2929
steps:
3030
- name: Checkout code
3131
uses: actions/checkout@v4
@@ -55,18 +55,18 @@ jobs:
5555
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
5656

5757
- name: Print arch
58-
run: docker run --rm ${{ matrix.arch }}/alpine:3.18 uname -a
58+
run: docker run --rm ${{ matrix.arch }}/alpine:3.19 uname -a
5959

6060
- name: Run tests on php ${{ matrix.php-version }}
61-
run: docker run -v $PWD:/app --workdir /app --rm ${{ matrix.arch }}/alpine:3.18 sh /app/do-tests.sh
61+
run: docker run -v $PWD:/app --workdir /app --rm ${{ matrix.arch }}/alpine:3.19 sh /app/do-tests.sh
6262

6363
test-php:
6464
name: Test on PHP ${{ matrix.php-version }}, ${{ matrix.composer-dependency }} and ${{ matrix.os }}
6565
runs-on: ${{ matrix.os }}
6666
continue-on-error: ${{ matrix.php-version == '8.4' }}
6767
strategy:
6868
matrix:
69-
php-version: ['8.1', '8.2', '8.3']
69+
php-version: ['8.2', '8.3']
7070
os: [ubuntu-latest]
7171
composer-dependency: [locked, highest]
7272
php-extensions: ['mbstring, iconv, mysqli, zip, gd, bz2']
@@ -133,7 +133,7 @@ jobs:
133133
runs-on: ${{ matrix.os }}
134134
strategy:
135135
matrix:
136-
php-version: ["8.1"]
136+
php-version: ["8.2"]
137137
os: [ubuntu-latest]
138138
extension: ["dbase"]
139139
steps:

‎.github/workflows/update-po.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: (github.event_name == 'schedule' && github.repository == 'phpmyadmin/phpmyadmin') || (github.event_name != 'schedule')
1919
strategy:
2020
matrix:
21-
php-version: ["8.1"]
21+
php-version: ["8.2"]
2222
steps:
2323
- name: Checkout code
2424
uses: actions/checkout@v4

‎.scrutinizer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build:
2121
nodes:
2222
analysis:
2323
environment:
24-
php: 8.1
24+
php: 8.2
2525
node: 16
2626
dependencies:
2727
before:

‎ChangeLog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ phpMyAdmin - ChangeLog
22
======================
33

44
6.0.0 (not yet released)
5-
- issue Bump minimum PHP version to 8.1.2
5+
- issue Bump minimum PHP version to 8.2.0
66
- issue #17842 Change js.cookie.js to js.cookie.min.js
77
- issue #17632 Improve tab keypress to text fields on the login form
88
- issue Make database and web server info separately configurable on `$cfg['ShowServerInfo']`

‎composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
}
4848
],
4949
"require": {
50-
"php": "^8.1.2",
50+
"php": "^8.2",
5151
"ext-hash": "*",
5252
"ext-iconv": "*",
5353
"ext-json": "*",
@@ -75,7 +75,6 @@
7575
"symfony/expression-language": "^6.2",
7676
"symfony/polyfill-ctype": "^1.24",
7777
"symfony/polyfill-mbstring": "^1.24",
78-
"symfony/polyfill-php82": "^1.29",
7978
"twig/twig": "^3.9",
8079
"webmozart/assert": "^1.10",
8180
"williamdes/mariadb-mysql-kbs": "^1.2"
@@ -154,7 +153,7 @@
154153
"composer/package-versions-deprecated": true
155154
},
156155
"platform": {
157-
"php": "8.1.99"
156+
"php": "8.2.99"
158157
}
159158
}
160159
}

0 commit comments

Comments
 (0)