Skip to content

Commit c6640e1

Browse files
committed
Merge branch 'release/1.8.0'
# Conflicts: # CHANGELOG.md # docker-compose.server.override.yml
2 parents bb3b862 + daaa511 commit c6640e1

118 files changed

Lines changed: 3962 additions & 3665 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ OIDC_CLI_LOGIN_ROUTE=OIDC_CLI_LOGIN_ROUTE_TEST
6060
VAULT_URL=https://vault.itkdev.dk
6161
VAULT_ROLE_ID="CHANGE_ME_IN_LOCAL_ENV"
6262
VAULT_SECRET_ID="CHANGE_ME_IN_LOCAL_ENV"
63+
64+
# The number of old results for each server/result-type combination
65+
APP_KEEP_RESULTS=5

.env.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# define your env variables for the test env here
1+
# Define your env variables for the test environment here
22
KERNEL_CLASS='App\Kernel'
33
APP_SECRET='$ecretf0rt3st'
44
SYMFONY_DEPRECATIONS_HELPER=999999

.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

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
.phpunit.result.cache
2020
###< phpunit/phpunit ###
2121

22-
###> symfony/phpunit-bridge ###
23-
.phpunit.result.cache
24-
/phpunit.xml
25-
###< symfony/phpunit-bridge ###
26-
2722
###> symfony/webpack-encore-bundle ###
2823
/node_modules/
2924
/public/build/
3025
npm-debug.log
3126
yarn-error.log
3227
###< symfony/webpack-encore-bundle ###
28+
29+
###> phpstan/phpstan ###
30+
phpstan.neon
31+
###< phpstan/phpstan ###
32+
.phpunit.cache

.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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.8.0] - 2025-02-06
11+
12+
- Upgrade to PHP 8.4
13+
- Upgrade to: Symfony 7.2, Doctrine ORM 3.x / DBAL 4.x, Api-platform 4.0, PhpUnit 11 with dependencies
14+
- Switch to PHPStan
15+
- Added cleanup for detection results
16+
- Refactor rootDir normalization to ensure values are always normalized, fix type errors,
17+
- Fix various values not being set
18+
1019
## [1.7.1] - 2024-11-08
1120

1221
- Added automatic deployment

composer.json

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,60 @@
77
"php": ">=8.3",
88
"ext-ctype": "*",
99
"ext-iconv": "*",
10-
"api-platform/core": "^3.0",
11-
"doctrine/annotations": "^2.0",
12-
"doctrine/doctrine-bundle": "^2.5",
13-
"doctrine/doctrine-migrations-bundle": "^3.2",
14-
"doctrine/orm": "^2.11",
10+
"api-platform/core": "^4.0",
11+
"doctrine/dbal": "^4.0",
12+
"doctrine/doctrine-bundle": "^2.13",
13+
"doctrine/doctrine-migrations-bundle": "^3.4",
14+
"doctrine/orm": "^3.0",
1515
"easycorp/easyadmin-bundle": "^4.0",
16-
"itk-dev/openid-connect-bundle": "^3.0",
17-
"itk-dev/vault-bundle": "^0.0.4",
16+
"itk-dev/openid-connect-bundle": "^4.0",
17+
"itk-dev/vault-bundle": "^0.1.0",
1818
"nelmio/cors-bundle": "^2.2",
19-
"ocramius/doctrine-batch-utils": "^2.3",
19+
"ocramius/doctrine-batch-utils": "^2.8",
2020
"phpdocumentor/reflection-docblock": "^5.3",
21-
"phpstan/phpdoc-parser": "^1.2",
22-
"symfony/amqp-messenger": "^6.4",
23-
"symfony/asset": "^6.4",
24-
"symfony/browser-kit": "^6.4",
25-
"symfony/console": "^6.4",
26-
"symfony/doctrine-messenger": "^6.4",
27-
"symfony/dotenv": "^6.4",
28-
"symfony/expression-language": "^6.4",
21+
"phpstan/phpdoc-parser": "^2.0",
22+
"symfony/amqp-messenger": "^7.2",
23+
"symfony/asset": "^7.2",
24+
"symfony/browser-kit": "^7.2",
25+
"symfony/console": "^7.2",
26+
"symfony/doctrine-messenger": "^7.2",
27+
"symfony/dotenv": "^7.2",
28+
"symfony/expression-language": "^7.2",
2929
"symfony/flex": "^2",
30-
"symfony/framework-bundle": "^6.4",
31-
"symfony/http-client": "^6.4",
32-
"symfony/messenger": "^6.4",
30+
"symfony/framework-bundle": "^7.2",
31+
"symfony/http-client": "^7.2",
32+
"symfony/messenger": "^7.2",
3333
"symfony/monolog-bundle": "^3.0",
34-
"symfony/property-access": "^6.4",
35-
"symfony/property-info": "^6.4",
36-
"symfony/proxy-manager-bridge": "^6.4",
37-
"symfony/runtime": "^6.4",
38-
"symfony/security-bundle": "^6.4",
39-
"symfony/serializer": "^6.4",
40-
"symfony/twig-bundle": "^6.4",
41-
"symfony/uid": "^6.4",
42-
"symfony/validator": "^6.4",
34+
"symfony/property-access": "^7.2",
35+
"symfony/property-info": "^7.2",
36+
"symfony/runtime": "^7.2",
37+
"symfony/security-bundle": "^7.2",
38+
"symfony/serializer": "^7.2",
39+
"symfony/twig-bundle": "^7.2",
40+
"symfony/uid": "^7.2",
41+
"symfony/validator": "^7.2",
4342
"symfony/webpack-encore-bundle": "^2.0",
44-
"symfony/yaml": "^6.4",
45-
"z4kn4fein/php-semver": "^2.0"
43+
"symfony/yaml": "^7.2",
44+
"z4kn4fein/php-semver": "^3.0"
4645
},
4746
"require-dev": {
4847
"ergebnis/composer-normalize": "^2.23",
4948
"friendsofphp/php-cs-fixer": "^3.6",
50-
"hautelook/alice-bundle": "^2.10",
51-
"justinrainbow/json-schema": "^5.2",
52-
"phpunit/phpunit": "^9.5",
53-
"psalm/plugin-symfony": "^5.1",
54-
"symfony/css-selector": "^6.4",
55-
"symfony/debug-bundle": "^6.4",
49+
"hautelook/alice-bundle": "^2.14",
50+
"justinrainbow/json-schema": "^6.0",
51+
"phpstan/extension-installer": "^1.4",
52+
"phpstan/phpstan": "^2.1",
53+
"phpstan/phpstan-doctrine": "^2.0",
54+
"phpstan/phpstan-phpunit": "^2.0",
55+
"phpstan/phpstan-symfony": "^2.0",
56+
"phpunit/phpunit": "^11.3",
57+
"rector/rector": "^2.0",
58+
"symfony/css-selector": "^7.2",
59+
"symfony/debug-bundle": "^7.2",
5660
"symfony/maker-bundle": "^1.37",
57-
"symfony/phpunit-bridge": "^6.4",
58-
"symfony/stopwatch": "^6.4",
59-
"symfony/var-dumper": "^6.4",
60-
"symfony/web-profiler-bundle": "^6.4",
61-
"vimeo/psalm": "^5.0",
62-
"weirdan/doctrine-psalm-plugin": "^2.2"
61+
"symfony/stopwatch": "^7.2",
62+
"symfony/var-dumper": "^7.2",
63+
"symfony/web-profiler-bundle": "^7.2"
6364
},
6465
"replace": {
6566
"symfony/polyfill-ctype": "*",
@@ -85,6 +86,7 @@
8586
"allow-plugins": {
8687
"composer/package-versions-deprecated": true,
8788
"ergebnis/composer-normalize": true,
89+
"phpstan/extension-installer": true,
8890
"symfony/flex": true,
8991
"symfony/runtime": true
9092
},
@@ -97,7 +99,7 @@
9799
"extra": {
98100
"symfony": {
99101
"allow-contrib": false,
100-
"require": "6.4.*"
102+
"require": "7.2.*"
101103
}
102104
},
103105
"scripts": {
@@ -112,10 +114,10 @@
112114
"assets:install %PUBLIC_DIR%": "symfony-cmd"
113115
},
114116
"coding-standards-apply": [
115-
"vendor/bin/php-cs-fixer fix"
117+
"PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix"
116118
],
117119
"coding-standards-check": [
118-
"vendor/bin/php-cs-fixer fix --dry-run"
120+
"PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run"
119121
],
120122
"fixtures-load": [
121123
"bin/console hautelook:fixtures:load --no-interaction"

0 commit comments

Comments
 (0)