Skip to content

Commit 8db35cf

Browse files
committed
drop php8.0 from build/composer, remove some older variants of symfony/process, minor changes to github action, stop psalm moaning about ClassMustBeFinal
1 parent 710ad71 commit 8db35cf

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

.github/workflows/php.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
runs-on: ubuntu-22.04
88
strategy:
99
matrix:
10-
php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
10+
php-versions: ['8.1', '8.2', '8.3', '8.4']
1111

1212
steps:
1313

14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
@@ -20,10 +20,7 @@ jobs:
2020
tools: composer
2121

2222
- name: Install xmlstarlet
23-
run: sudo apt-get install -y xmlstarlet
24-
25-
- name: Install nmap
26-
run: sudo apt-get install -y nmap
23+
run: DEBIAN_FRONTEND=noninteractive sudo apt-get -q update && sudo apt-get -yq install -y xmlstarlet nmap --no-install-recommends
2724

2825
- name: Validate composer.json and composer.lock
2926
run: composer validate
@@ -38,7 +35,7 @@ jobs:
3835
run: composer lint
3936

4037
- name: Run psalm
41-
run: ./vendor/bin/psalm.phar --php-version=${{ matrix.php-versions }} --output-format=github
38+
run: composer psalm-github
4239

4340
- name: Run phpunit
4441
run: composer phpunit

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
}
1414
],
1515
"require": {
16-
"php": ">= 8.0",
17-
"symfony/process": "~2.0|~3.0|~4.0|~5.0|~6.0|~7.0",
16+
"php": ">= 8.1",
17+
"symfony/process": "~4.0|~5.0|~6.0|~7.0",
1818
"ext-simplexml": "*",
1919
"symfony/filesystem": "~6.0|~7.0"
2020
},
2121
"require-dev": {
22-
"phpunit/phpunit": "7.*|8.*",
23-
"psalm/phar": " <6.1",
22+
"phpunit/phpunit": "7.*|8.*|9.*",
23+
"psalm/phar": "*",
2424
"php-parallel-lint/php-parallel-lint":"*",
2525
"squizlabs/php_codesniffer" : "*",
2626
"mockery/mockery": "*"
@@ -31,6 +31,7 @@
3131
"scripts": {
3232
"lint": "vendor/bin/parallel-lint src",
3333
"psalm": "vendor/bin/psalm.phar --show-info=false",
34+
"psalm-github": "vendor/bin/psalm.phar --show-info=false --output-format=github",
3435
"phpcs": "vendor/bin/phpcs --standard=PSR2 src",
3536
"phpcbf": "vendor/bin/phpcbf --standard=PSR2 src",
3637
"phpunit": "vendor/bin/phpunit",

psalm.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@
3737

3838
<PossiblyUnusedMethod errorLevel="info" />
3939
<InvalidStringClass errorLevel="info" />
40+
<ClassMustBeFinal errorLevel="info"/>
4041
</issueHandlers>
4142
</psalm>

0 commit comments

Comments
 (0)