Skip to content

Commit 93a6c14

Browse files
SonataCIdmaicher
SonataCI
authored and
dmaicher
committed
DevKit updates
1 parent 6590a47 commit 93a6c14

7 files changed

Lines changed: 32 additions & 21 deletions

File tree

‎.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
extensions: mongodb
@@ -54,7 +54,7 @@ jobs:
5454
- name: Install PHP with extensions
5555
uses: shivammathur/setup-php@v2
5656
with:
57-
php-version: '8.4'
57+
php-version: '8.5'
5858
coverage: none
5959
tools: composer:v2, composer-normalize:2
6060
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
extensions: mongodb
@@ -54,7 +54,7 @@ jobs:
5454
- name: Install PHP with extensions
5555
uses: shivammathur/setup-php@v2
5656
with:
57-
php-version: '8.4'
57+
php-version: '8.5'
5858
coverage: none
5959
tools: composer:v2
6060
extensions: mongodb
@@ -65,7 +65,7 @@ jobs:
6565
dependency-versions: highest
6666

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

7070
rector:
7171
name: Rector
@@ -79,7 +79,7 @@ jobs:
7979
- name: Install PHP with extensions
8080
uses: shivammathur/setup-php@v2
8181
with:
82-
php-version: '8.4'
82+
php-version: '8.5'
8383
coverage: none
8484
tools: composer:v2
8585
extensions: mongodb

‎.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
@@ -36,34 +36,39 @@ jobs:
3636
strategy:
3737
matrix:
3838
php-version:
39-
- '8.1'
4039
- '8.2'
4140
- '8.3'
4241
- '8.4'
42+
- '8.5'
4343
dependencies: [highest]
4444
allowed-to-fail: [false]
4545
symfony-require: ['']
4646
variant: [normal]
4747
include:
48-
- php-version: '8.1'
48+
- php-version: '8.2'
4949
dependencies: lowest
5050
allowed-to-fail: false
5151
variant: normal
52-
- php-version: '8.4'
52+
- php-version: '8.5'
5353
dependencies: highest
5454
allowed-to-fail: false
5555
symfony-require: 6.4.*
5656
variant: symfony/symfony:"6.4.*"
57-
- php-version: '8.4'
57+
- php-version: '8.5'
5858
dependencies: highest
5959
allowed-to-fail: false
60-
symfony-require: 7.1.*
61-
variant: symfony/symfony:"7.1.*"
62-
- php-version: '8.4'
60+
symfony-require: 7.3.*
61+
variant: symfony/symfony:"7.3.*"
62+
- php-version: '8.5'
6363
dependencies: highest
6464
allowed-to-fail: false
65-
symfony-require: 7.2.*
66-
variant: symfony/symfony:"7.2.*"
65+
symfony-require: 7.4.*
66+
variant: symfony/symfony:"7.4.*"
67+
- php-version: '8.5'
68+
dependencies: highest
69+
allowed-to-fail: false
70+
symfony-require: 8.0.*
71+
variant: symfony/symfony:"8.0.*"
6772

6873
steps:
6974
- name: Checkout
@@ -80,6 +85,11 @@ jobs:
8085
- name: Add PHPUnit matcher
8186
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
8287

88+
# until Psalm supports Symfony 8
89+
- name: Remove psalm
90+
if: matrix.symfony-require == '8.0.*'
91+
run: composer remove vimeo/psalm psalm/plugin-symfony psalm/plugin-phpunit --dev --no-update
92+
8393
- name: Install variant
8494
if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
8595
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)