Skip to content

Commit e47f449

Browse files
Merge pull request #21 from cleverage/20
Upgrade to Symfony 7.3 & PHP 8.4
2 parents de4958a + 735e23d commit e47f449

File tree

5 files changed

+30
-18
lines changed

5 files changed

+30
-18
lines changed

.docker/php/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2-fpm-alpine
1+
FROM php:8.4-fpm-alpine
22

33
ARG UID
44
ARG GID

.github/workflows/quality.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install PHP with extensions
2020
uses: shivammathur/setup-php@v2
2121
with:
22-
php-version: '8.2'
22+
php-version: '8.4'
2323
coverage: none
2424
tools: composer:v2
2525
- name: Install Composer dependencies (locked)
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install PHP with extensions
3737
uses: shivammathur/setup-php@v2
3838
with:
39-
php-version: '8.2'
39+
php-version: '8.4'
4040
coverage: none
4141
tools: composer:v2
4242
- name: Install Composer dependencies (locked)
@@ -53,7 +53,7 @@ jobs:
5353
- name: Install PHP with extensions
5454
uses: shivammathur/setup-php@v2
5555
with:
56-
php-version: '8.2'
56+
php-version: '8.4'
5757
coverage: none
5858
tools: composer:v2
5959
- name: Install Composer dependencies (locked)

.github/workflows/test.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@ jobs:
2222
php-version:
2323
- '8.2'
2424
- '8.3'
25+
- '8.4'
2526
dependencies: [highest]
2627
allowed-to-fail: [false]
2728
symfony-require: ['']
2829
variant: [normal]
2930
include:
31+
- php-version: '8.1'
32+
dependencies: highest
33+
allowed-to-fail: false
34+
symfony-require: 6.4.*
35+
variant: symfony/symfony:"6.4.*"
3036
- php-version: '8.2'
3137
dependencies: highest
3238
allowed-to-fail: false
@@ -35,8 +41,8 @@ jobs:
3541
- php-version: '8.2'
3642
dependencies: highest
3743
allowed-to-fail: false
38-
symfony-require: 7.1.*
39-
variant: symfony/symfony:"7.1.*"
44+
symfony-require: 7.3.*
45+
variant: symfony/symfony:"7.3.*"
4046
- php-version: '8.3'
4147
dependencies: highest
4248
allowed-to-fail: false
@@ -45,8 +51,18 @@ jobs:
4551
- php-version: '8.3'
4652
dependencies: highest
4753
allowed-to-fail: false
48-
symfony-require: 7.1.*
49-
variant: symfony/symfony:"7.1.*"
54+
symfony-require: 7.3.*
55+
variant: symfony/symfony:"7.3.*"
56+
- php-version: '8.4'
57+
dependencies: highest
58+
allowed-to-fail: false
59+
symfony-require: 6.4.*
60+
variant: symfony/symfony:"6.4.*"
61+
- php-version: '8.4'
62+
dependencies: highest
63+
allowed-to-fail: false
64+
symfony-require: 7.3.*
65+
variant: symfony/symfony:"7.3.*"
5066

5167
steps:
5268
- name: Checkout

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"require": {
4646
"php": ">=8.1",
4747
"cleverage/process-bundle": "^4.0",
48-
"symfony/http-client": "^6.4|^7.1"
48+
"symfony/http-client": "^6.4|^7.3"
4949
},
5050
"require-dev": {
5151
"friendsofphp/php-cs-fixer": "*",

rector.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,19 @@
88
use Rector\ValueObject\PhpVersion;
99

1010
return RectorConfig::configure()
11-
->withPhpVersion(PhpVersion::PHP_82)
11+
->withPhpVersion(PhpVersion::PHP_84)
1212
->withPaths([
1313
__DIR__.'/src',
1414
__DIR__.'/tests',
1515
])
16-
->withPhpSets(php82: true)
16+
->withPhpSets(php81: true)
1717
// here we can define, what prepared sets of rules will be applied
18-
->withPreparedSets(
19-
deadCode: true,
20-
codeQuality: true
21-
)
18+
->withPreparedSets(deadCode: true, codeQuality: true, symfonyCodeQuality: true)
19+
->withAttributesSets(symfony: true)
2220
->withSets([
23-
LevelSetList::UP_TO_PHP_82,
21+
LevelSetList::UP_TO_PHP_81,
2422
SymfonySetList::SYMFONY_64,
25-
SymfonySetList::SYMFONY_71,
2623
SymfonySetList::SYMFONY_CODE_QUALITY,
2724
SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
28-
SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES,
2925
])
3026
;

0 commit comments

Comments
 (0)