Skip to content

Commit d75a3c2

Browse files
Merge branch 'upgrade-dependencies' into 'main'
Upgrade: Symfony -> 7.2, PHP -> 8.4, PHPUnit -> 12 See merge request disi/innovation/aristote/aristoteapi!95
2 parents 242ec93 + 8cd55a0 commit d75a3c2

Some content is hidden

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

47 files changed

+2279
-1788
lines changed

.gitlab-ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ stages:
1515
- Build
1616

1717
.test_template: &test_template
18-
image: illuin/symfony-ready:8.2
18+
image: illuin/symfony-ready:8.4-node-22
1919
tags:
2020
- docker
2121
before_script:
@@ -47,11 +47,16 @@ tests:
4747
POSTGRES_PASSWORD: aristote
4848
POSTGRES_USER: api
4949
script:
50-
- apk add ffmpeg
50+
- apt update && apt install -y ffmpeg
5151
- sh tests/init-test-database.sh
5252
- openssl genrsa -out config/jwt/private.key 2048
5353
- openssl rsa -in config/jwt/private.key -pubout -out config/jwt/public.key
54-
- php vendor/bin/phpunit --coverage-text --coverage-cobertura=coverage.cobertura.xml
54+
- php vendor/bin/phpunit --coverage-cobertura=coverage.cobertura.xml
55+
- sed '/<!DOCTYPE/d' coverage.cobertura.xml > clean-coverage.xml
56+
- lineRate=$(xmlstarlet sel --nonet -t -v "/coverage/@line-rate" clean-coverage.xml)
57+
- percentage=$(printf "%.2f" "$(echo "$lineRate * 100" | bc -l)")
58+
- "echo -e Code coverage: $percentage% of line covered"
59+
coverage: '/Code coverage: \d+(?:\.\d+)?/'
5560
artifacts:
5661
reports:
5762
coverage_report:

composer.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"minimum-stability": "stable",
55
"prefer-stable": true,
66
"require": {
7-
"php": ">=8.1",
7+
"php": ">=8.4",
88
"ext-ctype": "*",
99
"ext-iconv": "*",
1010
"aws/aws-sdk-php": "^3.283",
@@ -18,33 +18,33 @@
1818
"league/flysystem-aws-s3-v3": "^3.16",
1919
"league/flysystem-bundle": "^3.2",
2020
"league/oauth2-server-bundle": "^0.8.0",
21-
"nelmio/api-doc-bundle": "^4.11",
22-
"php-ffmpeg/php-ffmpeg": "^1.2",
21+
"nelmio/api-doc-bundle": "^5.0",
22+
"php-ffmpeg/php-ffmpeg": "^1.3",
2323
"phpdocumentor/reflection-docblock": "^5.3",
2424
"phpstan/phpdoc-parser": "^1.16",
2525
"sonata-project/admin-bundle": "^4.27",
2626
"sonata-project/doctrine-orm-admin-bundle": "^4.13",
2727
"sonata-project/intl-bundle": "^3.1",
2828
"stof/doctrine-extensions-bundle": "^1.8",
29-
"symfony/asset": "7.1.*",
30-
"symfony/console": "7.1.*",
31-
"symfony/debug-bundle": "7.1.*",
32-
"symfony/doctrine-messenger": "7.1.*",
33-
"symfony/dotenv": "7.1.*",
29+
"symfony/asset": "7.2.*",
30+
"symfony/console": "7.2.*",
31+
"symfony/debug-bundle": "7.2.*",
32+
"symfony/doctrine-messenger": "7.2.*",
33+
"symfony/dotenv": "7.2.*",
3434
"symfony/flex": "^2",
35-
"symfony/framework-bundle": "7.1.*",
36-
"symfony/http-client": "7.1.*",
37-
"symfony/lock": "7.1.*",
38-
"symfony/messenger": "7.1.*",
39-
"symfony/process": "7.1.*",
40-
"symfony/property-access": "7.1.*",
41-
"symfony/property-info": "7.1.*",
42-
"symfony/runtime": "7.1.*",
43-
"symfony/security-bundle": "7.1.*",
44-
"symfony/serializer": "7.1.*",
45-
"symfony/twig-bundle": "7.1.*",
46-
"symfony/uid": "7.1.*",
47-
"symfony/yaml": "7.1.*",
35+
"symfony/framework-bundle": "7.2.*",
36+
"symfony/http-client": "7.2.*",
37+
"symfony/lock": "7.2.*",
38+
"symfony/messenger": "7.2.*",
39+
"symfony/process": "7.2.*",
40+
"symfony/property-access": "7.2.*",
41+
"symfony/property-info": "7.2.*",
42+
"symfony/runtime": "7.2.*",
43+
"symfony/security-bundle": "7.2.*",
44+
"symfony/serializer": "7.2.*",
45+
"symfony/twig-bundle": "7.2.*",
46+
"symfony/uid": "7.2.*",
47+
"symfony/yaml": "7.2.*",
4848
"twig/extra-bundle": "^3.7",
4949
"twig/twig": "^3.7",
5050
"vich/uploader-bundle": "^2.2"
@@ -53,15 +53,15 @@
5353
"dama/doctrine-test-bundle": "^8.2",
5454
"doctrine/doctrine-fixtures-bundle": "^3.4",
5555
"friendsofphp/php-cs-fixer": "^3.14",
56-
"phpunit/php-code-coverage": "^10.0",
57-
"phpunit/phpunit": "^10.0",
58-
"rector/rector": "^0.15.16",
59-
"symfony/browser-kit": "7.1.*",
60-
"symfony/css-selector": "7.1.*",
56+
"phpunit/php-code-coverage": "^12.0",
57+
"phpunit/phpunit": "^12.0",
58+
"rector/rector": "^2.0.16",
59+
"symfony/browser-kit": "7.2.*",
60+
"symfony/css-selector": "7.2.*",
6161
"symfony/maker-bundle": "^1.48",
62-
"symfony/phpunit-bridge": "^7.1",
63-
"symfony/stopwatch": "7.1.*",
64-
"symfony/web-profiler-bundle": "7.1.*"
62+
"symfony/phpunit-bridge": "^7.2",
63+
"symfony/stopwatch": "7.2.*",
64+
"symfony/web-profiler-bundle": "7.2.*"
6565
},
6666
"config": {
6767
"allow-plugins": {
@@ -108,7 +108,7 @@
108108
"extra": {
109109
"symfony": {
110110
"allow-contrib": false,
111-
"require": "7.1.*"
111+
"require": "7.2.*"
112112
}
113113
}
114114
}

0 commit comments

Comments
 (0)