Skip to content

Commit 287057c

Browse files
committed
feature #1277 Upgrade to Symfony 6.0 (javiereguiluz)
This PR was squashed before being merged into the main branch. Discussion ---------- Upgrade to Symfony 6.0 Commits ------- c15cb7e Upgrade to Symfony 6.0
2 parents c2315f7 + c15cb7e commit 287057c

File tree

8 files changed

+234
-501
lines changed

8 files changed

+234
-501
lines changed

.github/workflows/lint.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
coverage: "none"
4040
extensions: intl
4141
php-version: ${{ matrix.php-version }}
42-
tools: composer:v2, phpstan
42+
tools: composer:v2
4343

4444
- name: "Set composer cache directory"
4545
id: composer-cache
@@ -93,4 +93,4 @@ jobs:
9393

9494
- name: Run PHPStan
9595
if: always() && steps.install.outcome == 'success'
96-
run: phpstan analyze
96+
run: ./vendor/bin/phpstan analyze

composer.json

+36-33
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"prefer-stable": true,
88
"replace": {
99
"symfony/polyfill-php72": "*",
10-
"symfony/polyfill-php73": "*"
10+
"symfony/polyfill-php73": "*",
11+
"symfony/polyfill-php74": "*",
12+
"symfony/polyfill-php80": "*"
1113
},
1214
"require": {
1315
"php": ">=8.0.2",
@@ -17,47 +19,48 @@
1719
"doctrine/doctrine-bundle": "^2.5",
1820
"doctrine/doctrine-migrations-bundle": "^3.0",
1921
"doctrine/orm": "^2.10",
20-
"erusev/parsedown": "^1.6",
21-
"sensio/framework-extra-bundle": "^6.1",
22+
"erusev/parsedown": "^1.7",
23+
"sensio/framework-extra-bundle": "^6.2",
2224
"symfony/apache-pack": "^1.0",
23-
"symfony/asset": "^5.4",
24-
"symfony/console": "^5.4",
25-
"symfony/dotenv": "^5.4",
26-
"symfony/expression-language": "^5.4",
25+
"symfony/asset": "^6.0",
26+
"symfony/console": "^6.0",
27+
"symfony/dotenv": "^6.0",
28+
"symfony/expression-language": "^6.0",
2729
"symfony/flex": "^1.17.1",
28-
"symfony/form": "^5.4",
29-
"symfony/framework-bundle": "^5.4",
30-
"symfony/intl": "^5.4",
31-
"symfony/mailer": "^5.4",
32-
"symfony/monolog-bundle": "^3.1",
30+
"symfony/form": "^6.0",
31+
"symfony/framework-bundle": "^6.0",
32+
"symfony/intl": "^6.0",
33+
"symfony/mailer": "^6.0",
34+
"symfony/monolog-bundle": "^3.7",
3335
"symfony/polyfill-intl-messageformatter": "^1.12",
34-
"symfony/runtime": "^5.4",
35-
"symfony/security-bundle": "^5.4",
36-
"symfony/string": "^5.4",
37-
"symfony/translation": "^5.4",
38-
"symfony/twig-bundle": "^5.4",
39-
"symfony/validator": "^5.4",
40-
"symfony/webpack-encore-bundle": "^1.4",
41-
"symfony/yaml": "^5.4",
36+
"symfony/runtime": "^6.0",
37+
"symfony/security-bundle": "^6.0",
38+
"symfony/string": "^6.0",
39+
"symfony/translation": "^6.0",
40+
"symfony/twig-bundle": "^6.0",
41+
"symfony/validator": "^6.0",
42+
"symfony/webpack-encore-bundle": "^1.13",
43+
"symfony/yaml": "^6.0",
4244
"tgalopin/html-sanitizer-bundle": "^1.4",
43-
"twig/extra-bundle": "^3.0",
44-
"twig/intl-extra": "^3.0",
45-
"twig/markdown-extra": "^3.0"
45+
"twig/extra-bundle": "^3.3",
46+
"twig/intl-extra": "^3.3",
47+
"twig/markdown-extra": "^3.3"
4648
},
4749
"require-dev": {
4850
"dama/doctrine-test-bundle": "^6.7",
49-
"doctrine/doctrine-fixtures-bundle": "^3.0",
50-
"symfony/browser-kit": "^5.4",
51-
"symfony/css-selector": "^5.4",
52-
"symfony/debug-bundle": "^5.4",
53-
"symfony/maker-bundle": "^1.11",
54-
"symfony/phpunit-bridge": "^5.4",
55-
"symfony/stopwatch": "^5.4",
56-
"symfony/web-profiler-bundle": "^5.4"
51+
"doctrine/doctrine-fixtures-bundle": "^3.4",
52+
"phpstan/phpstan": "^1.2",
53+
"symfony/browser-kit": "^6.0",
54+
"symfony/css-selector": "^6.0",
55+
"symfony/debug-bundle": "^6.0",
56+
"symfony/maker-bundle": "^1.36",
57+
"symfony/phpunit-bridge": "^6.0",
58+
"symfony/stopwatch": "^6.0",
59+
"symfony/web-profiler-bundle": "^6.0"
5760
},
5861
"config": {
5962
"platform": {
60-
"php": "8.0.3"
63+
"php": "8.0.2"
6164
},
6265
"preferred-install": {
6366
"*": "dist"
@@ -92,7 +95,7 @@
9295
"extra": {
9396
"symfony": {
9497
"allow-contrib": true,
95-
"require": "5.4.*"
98+
"require": "6.0.*"
9699
}
97100
}
98101
}

0 commit comments

Comments
 (0)