Skip to content

Commit a360144

Browse files
SonataCIdmaicher
SonataCI
authored and
dmaicher
committed
DevKit updates
1 parent 58f9813 commit a360144

File tree

7 files changed

+32
-21
lines changed

7 files changed

+32
-21
lines changed

‎.github/workflows/lint.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
coverage: none
3434
tools: composer:v2
3535

@@ -53,7 +53,7 @@ jobs:
5353
- name: Install PHP with extensions
5454
uses: shivammathur/setup-php@v2
5555
with:
56-
php-version: '8.4'
56+
php-version: '8.5'
5757
coverage: none
5858
tools: composer:v2, composer-normalize:2
5959
env:

‎.github/workflows/qa.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
coverage: none
3434
tools: composer:v2
3535

@@ -53,7 +53,7 @@ jobs:
5353
- name: Install PHP with extensions
5454
uses: shivammathur/setup-php@v2
5555
with:
56-
php-version: '8.4'
56+
php-version: '8.5'
5757
coverage: none
5858
tools: composer:v2
5959

@@ -63,7 +63,7 @@ jobs:
6363
dependency-versions: highest
6464

6565
- name: Psalm
66-
run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.4
66+
run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.5
6767

6868
rector:
6969
name: Rector
@@ -77,7 +77,7 @@ jobs:
7777
- name: Install PHP with extensions
7878
uses: shivammathur/setup-php@v2
7979
with:
80-
php-version: '8.4'
80+
php-version: '8.5'
8181
coverage: none
8282
tools: composer:v2
8383

‎.github/workflows/symfony-lint.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
coverage: none
3434
tools: composer:v2
3535

@@ -53,7 +53,7 @@ jobs:
5353
- name: Install PHP with extensions
5454
uses: shivammathur/setup-php@v2
5555
with:
56-
php-version: '8.4'
56+
php-version: '8.5'
5757
coverage: none
5858
tools: composer:v2
5959

@@ -77,7 +77,7 @@ jobs:
7777
- name: Install PHP with extensions
7878
uses: shivammathur/setup-php@v2
7979
with:
80-
php-version: '8.4'
80+
php-version: '8.5'
8181
coverage: none
8282
tools: composer:v2
8383

@@ -101,7 +101,7 @@ jobs:
101101
- name: Install PHP with extensions
102102
uses: shivammathur/setup-php@v2
103103
with:
104-
php-version: '8.4'
104+
php-version: '8.5'
105105
coverage: none
106106
tools: composer:v2
107107

‎.github/workflows/test.yaml‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,39 @@ jobs:
3030
strategy:
3131
matrix:
3232
php-version:
33-
- '8.1'
3433
- '8.2'
3534
- '8.3'
3635
- '8.4'
36+
- '8.5'
3737
dependencies: [highest]
3838
allowed-to-fail: [false]
3939
symfony-require: ['']
4040
variant: [normal]
4141
include:
42-
- php-version: '8.1'
42+
- php-version: '8.2'
4343
dependencies: lowest
4444
allowed-to-fail: false
4545
variant: normal
46-
- php-version: '8.4'
46+
- php-version: '8.5'
4747
dependencies: highest
4848
allowed-to-fail: false
4949
symfony-require: 6.4.*
5050
variant: symfony/symfony:"6.4.*"
51-
- php-version: '8.4'
51+
- php-version: '8.5'
5252
dependencies: highest
5353
allowed-to-fail: false
54-
symfony-require: 7.1.*
55-
variant: symfony/symfony:"7.1.*"
56-
- php-version: '8.4'
54+
symfony-require: 7.3.*
55+
variant: symfony/symfony:"7.3.*"
56+
- php-version: '8.5'
5757
dependencies: highest
5858
allowed-to-fail: false
59-
symfony-require: 7.2.*
60-
variant: symfony/symfony:"7.2.*"
59+
symfony-require: 7.4.*
60+
variant: symfony/symfony:"7.4.*"
61+
- php-version: '8.5'
62+
dependencies: highest
63+
allowed-to-fail: false
64+
symfony-require: 8.0.*
65+
variant: symfony/symfony:"8.0.*"
6166

6267
steps:
6368
- name: Checkout
@@ -73,6 +78,11 @@ jobs:
7378
- name: Add PHPUnit matcher
7479
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
7580

81+
# until Psalm supports Symfony 8
82+
- name: Remove psalm
83+
if: matrix.symfony-require == '8.0.*'
84+
run: composer remove vimeo/psalm psalm/plugin-symfony psalm/plugin-phpunit --dev --no-update
85+
7686
- name: Install variant
7787
if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
7888
run: composer require ${{ matrix.variant }} --no-update

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ composer.lock
1010
phpunit.xml
1111
phpstan.neon
1212
/.phpunit.result.cache
13+
tests/App/config/reference.php
1314
/docs/_build/

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ phpstan:
117117
.PHONY: phpstan
118118

119119
psalm:
120-
vendor/bin/psalm --php-version=8.4
120+
vendor/bin/psalm --php-version=8.5
121121
.PHONY: psalm
122122

123123
rector:

‎rector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
]);
3434

3535
$rectorConfig->sets([
36-
LevelSetList::UP_TO_PHP_81,
36+
LevelSetList::UP_TO_PHP_82,
3737
PHPUnitSetList::PHPUNIT_100,
3838
PHPUnitSetList::PHPUNIT_CODE_QUALITY,
3939
]);

0 commit comments

Comments
 (0)