Skip to content

Commit b35b60a

Browse files
committed
[Turbo] Upgrade PHPStan to ^2.1.17, rename config file
1 parent 53515c6 commit b35b60a

File tree

5 files changed

+23
-7
lines changed

5 files changed

+23
-7
lines changed

.github/workflows/code-quality.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,27 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
package: ${{ fromJson(needs.php-packages-matrix.outputs.packages) }}
38+
php-version: [ '8.1', '8.2', '8.3', '8.4']
39+
dependency-version: ['']
40+
symfony-version: ['']
41+
minimum-stability: ['stable']
42+
include:
43+
# lowest deps
44+
- php-version: '8.1'
45+
dependency-version: 'lowest'
46+
# LTS version of Symfony
47+
- php-version: '8.1'
48+
symfony-version: '6.4.*'
3949
steps:
4050
- name: Checkout
4151
uses: actions/checkout@v4
4252

4353
- name: Configure environment
4454
run: |
4555
echo COLUMNS=120 >> $GITHUB_ENV
46-
echo COMPOSER_MIN_STAB='composer config minimum-stability stable --ansi' >> $GITHUB_ENV
47-
echo COMPOSER_UP='composer update --no-progress --no-interaction --ansi' >> $GITHUB_ENV
56+
echo COMPOSER_MIN_STAB='composer config minimum-stability ${{ matrix.minimum-stability || 'stable' }} --ansi' >> $GITHUB_ENV
57+
echo COMPOSER_UP='composer update ${{ matrix.dependency-version == 'lowest' && '--prefer-lowest' || '' }} --no-progress --no-interaction --ansi' >> $GITHUB_ENV
58+
echo PHPUNIT_INSTALL='vendor/bin/simple-phpunit install' >> $GITHUB_ENV
4859
echo PHPSTAN='vendor/bin/phpstan' >> $GITHUB_ENV
4960
5061
# TODO: Only Turbo has PHPStan configuration, let's improve this later :)
@@ -69,4 +80,4 @@ jobs:
6980
run: |
7081
source .github/workflows/.utils.sh
7182
72-
echo "$PACKAGES" | xargs -n1 | parallel -j +3 "_run_task {} '(cd src/{} && $COMPOSER_MIN_STAB && $COMPOSER_UP && $PHPSTAN)'"
83+
echo "$PACKAGES" | xargs -n1 | parallel -j +3 "_run_task {} '(cd src/{} && $COMPOSER_MIN_STAB && $COMPOSER_UP && $PHPUNIT_INSTALL && $PHPSTAN)'"

.github/workflows/functional-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ name: Functional Tests
33
on:
44
push:
55
paths:
6+
- '.github/workflows/functional-tests.yml'
67
- 'src/Turbo/**'
78
pull_request:
89
paths:
10+
- '.github/workflows/functional-tests.yml'
911
- 'src/Turbo/**'
1012

1113
jobs:

src/Turbo/.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/.git* export-ignore
22
/.symfony.bundle.yaml export-ignore
33
/phpunit.xml.dist export-ignore
4-
/phpstan.neon.dist export-ignore
4+
/phpstan.dist.neon export-ignore
55
/assets/src export-ignore
66
/assets/test export-ignore
77
/assets/vitest.config.js export-ignore

src/Turbo/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"require-dev": {
4141
"doctrine/doctrine-bundle": "^2.4.3",
4242
"doctrine/orm": "^2.8 | 3.0",
43-
"phpstan/phpstan": "^1.10",
43+
"phpstan/phpstan": "^2.1.17",
4444
"symfony/asset-mapper": "^6.4|^7.0",
4545
"symfony/debug-bundle": "^5.4|^6.0|^7.0",
4646
"symfony/form": "^5.4|^6.0|^7.0",
@@ -60,7 +60,8 @@
6060
"dbrekelmans/bdi": "dev-main"
6161
},
6262
"conflict": {
63-
"symfony/flex": "<1.13"
63+
"symfony/flex": "<1.13",
64+
"symfony/web-link": "<5.4.0"
6465
},
6566
"extra": {
6667
"thanks": {

src/Turbo/phpstan.neon.dist renamed to src/Turbo/phpstan.dist.neon

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ parameters:
77
- tests/app/var/*
88
# The Symfony Configuration API isn't good enough to be analysed
99
- src/DependencyInjection/Configuration.php
10+
# to allow installing with various phsptan versions without reporting old errors here
11+
reportUnmatchedIgnoredErrors: false
1012
inferPrivatePropertyTypeFromConstructor: true
1113
bootstrapFiles:
1214
- vendor/bin/.phpunit/phpunit/vendor/autoload.php

0 commit comments

Comments
 (0)