Skip to content

Commit 136bf83

Browse files
committed
Merge branch '5.11.x' into 6.0.x
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
2 parents 7539780 + 5303ac8 commit 136bf83

32 files changed

Lines changed: 2948 additions & 214 deletions

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Lint and analyse PHP files
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
pull_request:
@@ -13,15 +16,15 @@ jobs:
1316
php-version: [ '8.2' ]
1417
steps:
1518
- name: Checkout code
16-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
1720

1821
- name: Set up PHP ${{ matrix.php-version }}
1922
uses: shivammathur/setup-php@v2
2023
with:
2124
php-version: ${{ matrix.php-version }}
2225

2326
- name: Install Composer dependencies
24-
uses: ramsey/composer-install@v3
27+
uses: ramsey/composer-install@v4
2528

2629
- name: Check coding-standard
2730
run: composer run phpcs
@@ -36,15 +39,15 @@ jobs:
3639
php-version: [ '8.2' ]
3740
steps:
3841
- name: Checkout code
39-
uses: actions/checkout@v4
42+
uses: actions/checkout@v6
4043

4144
- name: Set up PHP ${{ matrix.php-version }}
4245
uses: shivammathur/setup-php@v2
4346
with:
4447
php-version: ${{ matrix.php-version }}
4548

4649
- name: Install Composer dependencies
47-
uses: ramsey/composer-install@v3
50+
uses: ramsey/composer-install@v4
4851

4952
- name: Analyse files with PHPStan
5053
run: composer run phpstan

.github/workflows/lint-docs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Lint PHP documentation
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
pull_request:
@@ -10,7 +13,7 @@ jobs:
1013
runs-on: ubuntu-latest
1114
steps:
1215
- name: Checkout code
13-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1417

1518
- name: lint php documentation
1619
uses: sudo-bot/action-doctum@v5

.github/workflows/mutation-tests.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Mutation tests
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
branches:
@@ -20,7 +23,7 @@ jobs:
2023
operating-system: [ ubuntu-latest ]
2124
steps:
2225
- name: Checkout code
23-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2427

2528
- name: Fetch github.base_ref (for diffing)
2629
if: ${{ github.base_ref != '' }}
@@ -36,7 +39,7 @@ jobs:
3639
tools: infection
3740

3841
- name: Install Composer dependencies
39-
uses: ramsey/composer-install@v3
42+
uses: ramsey/composer-install@v4
4043

4144
- name: Collect coverage report
4245
run: composer run phpunit -- --stop-on-failure

.github/workflows/tests.yml

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Run tests
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
pull_request:
@@ -12,15 +15,15 @@ jobs:
1215
continue-on-error: ${{ matrix.experimental }}
1316
strategy:
1417
matrix:
15-
php-version: [ '8.2', '8.3', '8.4' ]
18+
php-version: [ '8.2', '8.3', '8.4', '8.5' ]
1619
os: [ ubuntu-latest ]
1720
experimental: [ false ]
1821
composer-options: [ '' ]
1922
include:
20-
- { php-version: '8.5', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
23+
- { php-version: '8.6', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
2124
steps:
2225
- name: Checkout code
23-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2427
with:
2528
# Fetch some commits for Scrutinizer coverage upload
2629
fetch-depth: 15
@@ -38,15 +41,34 @@ jobs:
3841
coverage: xdebug
3942

4043
- name: Install Composer dependencies
41-
uses: ramsey/composer-install@v3
44+
uses: ramsey/composer-install@v4
4245
with:
4346
composer-options: ${{ matrix.composer-options }}
4447

4548
- name: Run PHP tests
4649
run: composer run phpunit
4750

4851
- name: Send coverage
49-
uses: codecov/codecov-action@v3
52+
uses: codecov/codecov-action@v6
53+
# Do not run this step on forked versions of the main repository (example: contributor forks)
54+
if: github.repository == 'phpmyadmin/sql-parser'
55+
with:
56+
fail_ci_if_error: true
57+
token: ${{ secrets.CODECOV_TOKEN }}
58+
flags: unit-${{ matrix.php-version }}-${{ matrix.os }}
59+
name: phpunit-${{ matrix.php-version }}-${{ matrix.os }}
60+
report_type: coverage
61+
62+
- name: Upload test results
63+
uses: codecov/codecov-action@v6
64+
# Do not run this step on forked versions of the main repository (example: contributor forks)
65+
if: ${{ github.repository == 'phpmyadmin/sql-parser' && !cancelled() }}
66+
with:
67+
fail_ci_if_error: true
68+
token: ${{ secrets.CODECOV_TOKEN }}
69+
flags: unit-${{ matrix.php-version }}-${{ matrix.os }}
70+
name: phpunit-${{ matrix.php-version }}-${{ matrix.os }}
71+
report_type: test_results
5072

5173
- name: Send coverage to Scrutinizer
5274
uses: sudo-bot/action-scrutinizer@latest
@@ -61,15 +83,15 @@ jobs:
6183
continue-on-error: ${{ matrix.experimental }}
6284
strategy:
6385
matrix:
64-
php-version: [ '8.2', '8.3', '8.4' ]
86+
php-version: [ '8.2', '8.3', '8.4', '8.5' ]
6587
os: [ ubuntu-latest ]
6688
experimental: [ false ]
6789
composer-options: [ '' ]
6890
include:
69-
- { php-version: '8.5', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
91+
- { php-version: '8.6', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
7092
steps:
7193
- name: Checkout code
72-
uses: actions/checkout@v4
94+
uses: actions/checkout@v6
7395
with:
7496
# Fetch some commits for Scrutinizer coverage upload
7597
fetch-depth: 15
@@ -87,7 +109,7 @@ jobs:
87109
coverage: xdebug
88110

89111
- name: Install Composer dependencies
90-
uses: ramsey/composer-install@v3
112+
uses: ramsey/composer-install@v4
91113
with:
92114
composer-options: ${{ matrix.composer-options }}
93115

.scrutinizer.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ build:
2020
php: 8.2
2121
dependencies:
2222
before:
23+
- sudo /home/scrutinizer/.phpenv/shims/php -f /usr/bin/composer.phar self-update --2
24+
- composer --version
2325
- composer install
2426
tests:
2527
override:

0 commit comments

Comments
 (0)