Skip to content

Commit c66ecc9

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18078 from MauricioFauth/pma6-php81
[RFC] Change phpMyAdmin version from 5.3 to 6.0 and bump min PHP version
2 parents 569e472 + 040b4c5 commit c66ecc9

27 files changed

Lines changed: 328 additions & 147 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: '5.3', branch: 'master', php-version: '7.2', node-version: '14', python-version: '3.7' }
25+
- { version: '6.0', branch: 'master', php-version: '8.1', node-version: '14', python-version: '3.7' }
2626
steps:
2727
- name: Check out code
2828
uses: actions/checkout@v3

‎.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: ["7.2"]
19+
php-version: ["8.1"]
2020
steps:
2121
- name: Checkout code
2222
uses: actions/checkout@v3
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: ubuntu-latest
6666
strategy:
6767
matrix:
68-
php-version: ["7.2"]
68+
php-version: ["8.1"]
6969
steps:
7070
- name: Checkout code
7171
uses: actions/checkout@v3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
strategy:
3535
matrix:
36-
php-version: ["7.2"]
36+
php-version: ["8.1"]
3737
steps:
3838
- name: Checkout code
3939
uses: actions/checkout@v3

‎.github/workflows/tests.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- { php-version: '8', experimental: false, arch: 'amd64', exclude-phpunit-groups: 'extension-iconv' }
24-
- { php-version: '8', experimental: false, arch: 'arm64v8', exclude-phpunit-groups: 'extension-iconv' }
25-
- { php-version: '8', experimental: false, arch: 'arm32v7', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
26-
- { php-version: '8', experimental: false, arch: 'arm32v6', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
27-
- { php-version: '8', experimental: false, arch: 'i386', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
28-
- { php-version: '8', experimental: true, arch: 'ppc64le', exclude-phpunit-groups: 'extension-iconv' }
29-
- { php-version: '8', experimental: false, arch: 's390x', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
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: 'arm32v6', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
27+
- { php-version: '81', experimental: false, arch: 'i386', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
28+
- { php-version: '81', experimental: true, arch: 'ppc64le', exclude-phpunit-groups: 'extension-iconv' }
29+
- { php-version: '81', experimental: false, arch: 's390x', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
3030
steps:
3131
- name: Checkout code
3232
uses: actions/checkout@v3
@@ -56,18 +56,18 @@ jobs:
5656
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
5757

5858
- name: Print arch
59-
run: docker run --rm ${{ matrix.arch }}/alpine:3.15 uname -a
59+
run: docker run --rm ${{ matrix.arch }}/alpine:3.17 uname -a
6060

6161
- name: Run tests on php ${{ matrix.php-version }}
62-
run: docker run -v $PWD:/app --workdir /app --rm ${{ matrix.arch }}/alpine:3.15 sh /app/do-tests.sh
62+
run: docker run -v $PWD:/app --workdir /app --rm ${{ matrix.arch }}/alpine:3.17 sh /app/do-tests.sh
6363

6464
test-php:
6565
name: Test on PHP ${{ matrix.php-version }} and ${{ matrix.os }}
6666
runs-on: ${{ matrix.os }}
6767
continue-on-error: ${{ matrix.experimental }}
6868
strategy:
6969
matrix:
70-
php-version: ["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]
70+
php-version: ["8.1", "8.2"]
7171
experimental: [false]
7272
os: [ubuntu-latest]
7373
phpunit-options: ['--testsuite unit']
@@ -136,7 +136,7 @@ jobs:
136136
runs-on: ${{ matrix.os }}
137137
strategy:
138138
matrix:
139-
php-version: ["7.2"]
139+
php-version: ["8.1"]
140140
os: [ubuntu-latest]
141141
extension: ["dbase", "recode"]
142142
steps:
@@ -196,7 +196,7 @@ jobs:
196196
strategy:
197197
fail-fast: false
198198
matrix:
199-
php-version: ['7.3']
199+
php-version: ['8.1']
200200
os: [ubuntu-latest]
201201
php-extensions: ['mbstring, iconv, mysqli, zip, bz2']
202202
psr-7-library: ['guzzlehttp/psr7', 'nyholm/psr7', 'laminas/laminas-diactoros']

‎.scrutinizer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ build:
2222
nodes:
2323
analysis:
2424
environment:
25-
php: 7.2
25+
php: 8.1
2626
node: 14
2727
dependencies:
2828
before:

‎ChangeLog‎

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

4-
5.3.0 (not yet released)
4+
6.0.0 (not yet released)
5+
- issue Bump minimum PHP version to 8.1.0
56
- issue #17842 Change js.cookie.js to js.cookie.min.js
67
- issue #17632 Improve tab keypress to text fields on the login form
78

‎README‎

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

4-
Version 5.3.0-dev
4+
Version 6.0.0-dev
55

66
A web interface for MySQL and MariaDB.
77

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
}
4848
],
4949
"require": {
50-
"php": "^7.2.5 || ^8.0",
50+
"php": "^8.1",
5151
"ext-hash": "*",
5252
"ext-iconv": "*",
5353
"ext-json": "*",
@@ -105,7 +105,7 @@
105105
"phpstan/phpstan-phpunit": "^1.0",
106106
"phpstan/phpstan-strict-rules": "^1.4",
107107
"phpstan/phpstan-webmozart-assert": "^1.0",
108-
"phpunit/phpunit": "^8.5 || ^9.5",
108+
"phpunit/phpunit": "^9.5",
109109
"pragmarx/google2fa-qrcode": "^2.1",
110110
"psalm/plugin-phpunit": "^0.16.1",
111111
"roave/security-advisories": "dev-latest",
@@ -117,7 +117,7 @@
117117
},
118118
"extra": {
119119
"branch-alias": {
120-
"dev-master": "5.3.x-dev"
120+
"dev-master": "6.0.x-dev"
121121
}
122122
},
123123
"scripts": {

‎doc/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
# built documents.
5252
#
5353
# The short X.Y version.
54-
version = '5.3.0-dev'
54+
version = '6.0.0-dev'
5555
# The full version, including alpha/beta/rc tags.
5656
release = version
5757

‎doc/faq.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ HHVM is supported up to phpMyAdmin 4.8.
436436

437437
Since release 5.0, phpMyAdmin supports only PHP 7.1 and newer.
438438
Since release 5.2, phpMyAdmin supports only PHP 7.2 and newer.
439+
Since release 6.0, phpMyAdmin supports only PHP 8.1 and newer.
439440

440441
.. _faq1_32:
441442

0 commit comments

Comments
 (0)