Skip to content

Commit e13c310

Browse files
authored
Merge pull request #50 from itk-dev/feature/php_upgrade
3666: Upgrade to PHP 8.4
2 parents b21627d + 4d36774 commit e13c310

8 files changed

Lines changed: 331 additions & 325 deletions

File tree

.github/workflows/pr.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
php: ["8.3"]
9+
php: ["8.4"]
1010
name: Validate composer (PHP ${{ matrix.php}})
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Setup PHP, with composer and extensions
1616
uses: shivammathur/setup-php@v2
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
php: ["8.3"]
59+
php: ["8.4"]
6060
name: Validate Doctrine Schema (PHP ${{ matrix.php}})
6161
services:
6262
mariadb:
@@ -71,7 +71,7 @@ jobs:
7171
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
7272
steps:
7373
- name: Checkout
74-
uses: actions/checkout@v3
74+
uses: actions/checkout@v4
7575

7676
- name: Setup PHP, with composer and extensions
7777
uses: shivammathur/setup-php@v2
@@ -110,11 +110,11 @@ jobs:
110110
strategy:
111111
fail-fast: false
112112
matrix:
113-
php: ["8.3"]
113+
php: ["8.4"]
114114
name: PHP Coding Standards Fixer (PHP ${{ matrix.php }})
115115
steps:
116116
- name: Checkout
117-
uses: actions/checkout@v3
117+
uses: actions/checkout@v4
118118

119119
- name: Setup PHP, with composer and extensions
120120
uses: shivammathur/setup-php@v2
@@ -138,7 +138,7 @@ jobs:
138138
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
139139

140140
- name: php-cs-fixer
141-
run: phpdbg -qrr ./vendor/bin/php-cs-fixer fix --dry-run
141+
run: composer coding-standards-check
142142

143143
phpunit:
144144
runs-on: ubuntu-latest
@@ -156,11 +156,11 @@ jobs:
156156
strategy:
157157
fail-fast: false
158158
matrix:
159-
php: ["8.3"]
159+
php: ["8.4"]
160160
name: PHP Unit tests (PHP ${{ matrix.php }})
161161
steps:
162162
- name: Checkout
163-
uses: actions/checkout@v3
163+
uses: actions/checkout@v4
164164

165165
- name: Setup PHP, with composer and extensions
166166
uses: shivammathur/setup-php@v2
@@ -194,10 +194,10 @@ jobs:
194194
strategy:
195195
fail-fast: false
196196
matrix:
197-
php: ["8.3"]
197+
php: ["8.4"]
198198
steps:
199199
- name: Checkout
200-
uses: actions/checkout@v3
200+
uses: actions/checkout@v4
201201
with:
202202
fetch-depth: 2
203203

@@ -235,7 +235,7 @@ jobs:
235235
fail-fast: false
236236
steps:
237237
- name: Checkout
238-
uses: actions/checkout@v3
238+
uses: actions/checkout@v4
239239
with:
240240
fetch-depth: 2
241241

@@ -275,7 +275,7 @@ jobs:
275275
fail-fast: false
276276
steps:
277277
- name: Checkout
278-
uses: actions/checkout@v3
278+
uses: actions/checkout@v4
279279
with:
280280
fetch-depth: 2
281281

.woodpecker/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ steps:
2222
playbook: 'release'
2323
pre_up:
2424
- itkdev-docker-compose-server run phpfpm bin/console doctrine:migrations:migrate --no-interaction
25+
- itkdev-docker-compose-server run phpfpm bin/console messenger:setup-transports
2526

2627
- name: Run post deploy
2728
image: itkdev/ansible-plugin:1

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
- Upgrade to PHP 8.4
1011
- Upgrade to: Symfony 7.2, Doctrine ORM 3.x / DBAL 4.x, Api-platform 4.0, PhpUnit 11 with dependencies
1112
- Switch to PHPStan
1213
- Added cleanup for detection results

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@
114114
"assets:install %PUBLIC_DIR%": "symfony-cmd"
115115
},
116116
"coding-standards-apply": [
117-
"vendor/bin/php-cs-fixer fix"
117+
"PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix"
118118
],
119119
"coding-standards-check": [
120-
"vendor/bin/php-cs-fixer fix --dry-run"
120+
"PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run"
121121
],
122122
"fixtures-load": [
123123
"bin/console hautelook:fixtures:load --no-interaction"

0 commit comments

Comments
 (0)