Skip to content

Commit eba4f92

Browse files
committed
feature #1532 Upgrade to Symfony 7.2 (javiereguiluz, nicolas-grekas)
This PR was merged into the main branch. Discussion ---------- Upgrade to Symfony 7.2 This PR is based on #1529 with the following changes: - composer.lock is no committed, so that people always get the latest dependencies (note that this is how e.g. laravel installation works, so we're not inventing anything here, this is proven strategy.) - because composer.lock is not committed, flex will run recipes that are not found in symfony.lock. In this PR, I removed listing symfony/framework-bundle there, so that its recipe is run when installing the demo app. As a result and thanks to symfony/recipes#1342, flex will generate APP_SECRET in .env.local - I also synced all recipes meanwhile Commits ------- 10afb78 Sync with latest recipes 8fc2dd4 Remove some unneeded config options 74d38a5 Remove the value of the APP_SECRET env var 71ff694 Update symfony/framework-bundle recipe 305f15c Update doctrine/doctrine-bundle recipe 837583a Update dependencies
2 parents 22d4acf + 10afb78 commit eba4f92

28 files changed

+124
-9605
lines changed

.env

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
###> symfony/framework-bundle ###
1818
APP_ENV=dev
19-
APP_SECRET=2ca64f8d83b9e89f5f19d672841d6bb8
20-
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
21-
#TRUSTED_HOSTS='^(localhost|example\.com)$'
19+
APP_SECRET=
2220
###< symfony/framework-bundle ###
2321

2422
###> doctrine/doctrine-bundle ###

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@
2222
/public/assets/
2323
/assets/vendor/
2424
###< symfony/asset-mapper ###
25+
26+
###> phpstan/phpstan ###
27+
phpstan.neon
28+
###< phpstan/phpstan ###

composer.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"license": "MIT",
44
"type": "project",
55
"description": "Symfony Demo Application",
6-
"minimum-stability": "stable",
6+
"minimum-stability": "dev",
77
"prefer-stable": true,
88
"replace": {
99
"symfony/polyfill-php72": "*",
@@ -22,30 +22,30 @@
2222
"doctrine/orm": "^3.0",
2323
"league/commonmark": "^2.1",
2424
"symfony/apache-pack": "^1.0",
25-
"symfony/asset": "7.1.*",
26-
"symfony/asset-mapper": "7.1.*",
27-
"symfony/console": "7.1.*",
28-
"symfony/dotenv": "7.1.*",
29-
"symfony/expression-language": "7.1.*",
25+
"symfony/asset": "^7",
26+
"symfony/asset-mapper": "^7",
27+
"symfony/console": "^7",
28+
"symfony/dotenv": "^7",
29+
"symfony/expression-language": "^7",
3030
"symfony/flex": "^2",
31-
"symfony/form": "7.1.*",
32-
"symfony/framework-bundle": "7.1.*",
33-
"symfony/html-sanitizer": "7.1.*",
34-
"symfony/http-client": "7.1.*",
35-
"symfony/intl": "7.1.*",
36-
"symfony/mailer": "7.1.*",
31+
"symfony/form": "^7",
32+
"symfony/framework-bundle": "^7",
33+
"symfony/html-sanitizer": "^7",
34+
"symfony/http-client": "^7",
35+
"symfony/intl": "^7",
36+
"symfony/mailer": "^7",
3737
"symfony/monolog-bundle": "^3.7",
3838
"symfony/polyfill-intl-messageformatter": "^1.12",
39-
"symfony/runtime": "7.1.*",
40-
"symfony/security-bundle": "7.1.*",
39+
"symfony/runtime": "^7",
40+
"symfony/security-bundle": "^7",
4141
"symfony/stimulus-bundle": "^2.12",
42-
"symfony/string": "7.1.*",
43-
"symfony/translation": "7.1.*",
44-
"symfony/twig-bundle": "7.1.*",
42+
"symfony/string": "^7",
43+
"symfony/translation": "^7",
44+
"symfony/twig-bundle": "^7",
4545
"symfony/ux-live-component": "^2.6",
46-
"symfony/validator": "7.1.*",
47-
"symfony/yaml": "7.1.*",
48-
"symfonycasts/sass-bundle": "^0.3",
46+
"symfony/validator": "^7",
47+
"symfony/yaml": "^7",
48+
"symfonycasts/sass-bundle": "^0.7",
4949
"twig/extra-bundle": "^3.3",
5050
"twig/intl-extra": "^3.3",
5151
"twig/markdown-extra": "^3.3"
@@ -57,14 +57,14 @@
5757
"phpstan/phpstan": "^1.2",
5858
"phpstan/phpstan-doctrine": "^1.3",
5959
"phpstan/phpstan-symfony": "^1.2",
60-
"symfony/browser-kit": "7.1.*",
61-
"symfony/css-selector": "7.1.*",
62-
"symfony/debug-bundle": "7.1.*",
60+
"symfony/browser-kit": "^7",
61+
"symfony/css-selector": "^7",
62+
"symfony/debug-bundle": "^7",
6363
"symfony/maker-bundle": "^1.36",
64-
"symfony/phpunit-bridge": "7.1.*",
65-
"symfony/stopwatch": "7.1.*",
66-
"symfony/web-profiler-bundle": "7.1.*",
67-
"twbs/bootstrap": "^4.5.3"
64+
"symfony/phpunit-bridge": "^7",
65+
"symfony/stopwatch": "^7",
66+
"symfony/web-profiler-bundle": "^7",
67+
"twbs/bootstrap": "^5"
6868
},
6969
"config": {
7070
"allow-plugins": {
@@ -107,7 +107,7 @@
107107
"extra": {
108108
"symfony": {
109109
"allow-contrib": true,
110-
"require": "7.1.*"
110+
"require": "7.2.*"
111111
}
112112
}
113113
}

0 commit comments

Comments
 (0)