Skip to content

Commit 3dbd046

Browse files
committed
Use PHP versions from flake in codequality tests
1 parent 3e10d88 commit 3dbd046

2 files changed

Lines changed: 16 additions & 22 deletions

File tree

.github/workflows/codequality.yml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ jobs:
2020
test:
2121
runs-on: ubuntu-latest
2222

23-
strategy:
24-
matrix:
25-
php: ["8.1", "8.2", "8.3", "8.4"]
26-
27-
name: PHP-${{ matrix.php }}
23+
name: PHP tests and coding standards
2824

2925
steps:
3026
- name: Checkout code
@@ -36,13 +32,6 @@ jobs:
3632
path: vendor
3733
key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
3834

39-
- name: Setup PHP
40-
uses: shivammathur/setup-php@v2
41-
with:
42-
php-version: ${{ matrix.php }}
43-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
44-
coverage: none
45-
4635
- name: Validate Composer setup
4736
run: composer validate --strict
4837

@@ -55,15 +44,18 @@ jobs:
5544
- name: Test PHP Coding Standards
5645
run: composer run-script phpcs
5746

58-
- name: Test code against PHP 7.4 standard
59-
run: composer run-script php74
60-
61-
- name: Test code against PHP 8.0 standard
62-
run: composer run-script php80
63-
6447
- name: Test code against PHP 8.1 standard
6548
run: composer run-script php81
6649

50+
- name: Test code against PHP 8.2 standard
51+
run: composer run-script php82
52+
53+
- name: Test code against PHP 8.3 standard
54+
run: composer run-script php83
55+
56+
- name: Test code against PHP 8.4 standard
57+
run: composer run-script php84
58+
6759
- name: Run PHPStan static analyser
6860
run: composer run-script phpstan
6961

composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,21 @@
6161
"phpstan": "php -d memory_limit=-1 ./vendor/bin/phpstan analyse",
6262
"phpcbf": "vendor/bin/phpcbf --standard=./tools/phpcs.xml --ignore=*/js/*,*/tests/phpstan/*,*/admin/*,*/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
6363
"phpcs": "vendor/bin/phpcs -s --standard=./tools/phpcs.xml --ignore=*/tests/phpstan/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
64-
"php74": "vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 7.4 --ignore=*/tests/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
65-
"php80": "vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 8.0 --ignore=*/tests/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
6664
"php81": "vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 8.1 --ignore=*/tests/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
65+
"php82": "vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 8.2 --ignore=*/tests/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
66+
"php83": "vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 8.3 --ignore=*/tests/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
67+
"php84": "vendor/bin/phpcs --standard=PHPCompatibility --runtime-set testVersion 8.4 --ignore=*/tests/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/integration-tests/bedrock/*,*/integration-tests/result*,*/integration-tests/wordpress/* ./",
6768
"phpunit": "vendor/bin/phpunit ./tests/unit/",
6869
"coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit tests/unit --coverage-html coverage --whitelist src/",
6970
"lint": "vendor/bin/parallel-lint --exclude integration-tests --exclude vendor .",
7071
"test": [
7172
"composer validate --strict",
7273
"@lint",
7374
"@phpcs",
74-
"@php74",
75-
"@php80",
7675
"@php81",
76+
"@php82",
77+
"@php83",
78+
"@php84",
7779
"@phpstan",
7880
"@phpunit"
7981
],

0 commit comments

Comments
 (0)