Skip to content

Commit 83609c7

Browse files
Merge pull request #366 from mauriciofauth/php72
Bump PHP minimum version to 7.2.5
2 parents e9c5a45 + 0147fc9 commit 83609c7

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ on:
77
branches:
88
- master
99
- QA
10+
- 6.0.x
1011

1112
jobs:
1213
lint-php:
1314
runs-on: ubuntu-latest
1415
steps:
1516
- uses: actions/checkout@v2
16-
- name: Use php 7.1
17+
- name: Use php 7.2
1718
uses: shivammathur/setup-php@v2
1819
with:
19-
php-version: 7.1
20+
php-version: 7.2
2021
tools: composer:v2
2122
- name: Validate composer.json and composer.lock
2223
run: composer validate
@@ -34,7 +35,7 @@ jobs:
3435
runs-on: ubuntu-latest
3536
strategy:
3637
matrix:
37-
php-version: ["7.1"]
38+
php-version: ["7.2"]
3839
steps:
3940
- uses: actions/checkout@v2
4041
- name: Use PHP ${{ matrix.php-version }}

.github/workflows/lint-docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
branches:
88
- master
99
- QA
10+
- 6.0.x
1011

1112
jobs:
1213
lint-docs:

.github/workflows/mutation-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ name: Mutation tests
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
7+
- 6.0.x
68
pull_request:
7-
branches: [master]
9+
branches:
10+
- master
11+
- 6.0.x
812

913
jobs:
1014
tests:

.github/workflows/tests.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
branches:
88
- master
99
- QA
10+
- 6.0.x
1011

1112
jobs:
1213
test-php:
@@ -15,7 +16,7 @@ jobs:
1516
continue-on-error: ${{ matrix.experimental }}
1617
strategy:
1718
matrix:
18-
php-version: ["7.1", "7.2", "7.3", "7.4", "8.0"]
19+
php-version: ["7.2", "7.3", "7.4", "8.0"]
1920
os: [ubuntu-latest]
2021
experimental: [false]
2122
composer-options: ['']
@@ -48,9 +49,6 @@ jobs:
4849
${{ runner.os }}-composer-
4950
- name: Install dependencies
5051
run: composer install --no-interaction ${{ matrix.composer-options }}
51-
- name: Install motranslator
52-
if: ${{ matrix.php-version == '7.1' }}
53-
run: composer require phpmyadmin/motranslator:^3.0
5452
- name: Run php tests
5553
run: ./vendor/bin/phpunit
5654
- name: Send coverage

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ build:
1717
nodes:
1818
analysis:
1919
environment:
20-
php: 7.1
20+
php: 7.2
2121
dependencies:
2222
before:
2323
- composer install

composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,23 @@
1616
"source": "https://github.com/phpmyadmin/sql-parser"
1717
},
1818
"require": {
19-
"php": "^7.1 || ^8.0",
19+
"php": "^7.2.5 || ^8.0",
2020
"symfony/polyfill-mbstring": "^1.3",
2121
"symfony/polyfill-php80": "^1.16"
2222
},
2323
"require-dev": {
2424
"phpmyadmin/coding-standard": "^3.0",
25-
"phpmyadmin/motranslator": "^4.0 || ^5.0",
25+
"phpmyadmin/motranslator": "^5.2",
2626
"phpstan/extension-installer": "^1.1",
27-
"phpstan/phpstan": "^1.2",
27+
"phpstan/phpstan": "^1.3",
2828
"phpstan/phpstan-phpunit": "^1.0",
29-
"phpunit/php-code-coverage": "*",
30-
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
29+
"phpunit/phpunit": "^8.5 || ^9.5",
3130
"psalm/plugin-phpunit": "^0.16.1",
32-
"vimeo/psalm": "^4.11",
31+
"vimeo/psalm": "^4.17",
3332
"zumba/json-serializer": "^3.0"
3433
},
3534
"conflict": {
36-
"phpmyadmin/motranslator": "<3.0"
35+
"phpmyadmin/motranslator": "<5.2"
3736
},
3837
"suggest": {
3938
"ext-mbstring": "For best performance",

0 commit comments

Comments
 (0)