Skip to content

Commit

Permalink
feature #1532 Upgrade to Symfony 7.2 (javiereguiluz, nicolas-grekas)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
javiereguiluz committed Oct 3, 2024
2 parents 22d4acf + 10afb78 commit eba4f92
Show file tree
Hide file tree
Showing 28 changed files with 124 additions and 9,605 deletions.
4 changes: 1 addition & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

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

###> doctrine/doctrine-bundle ###
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@
/public/assets/
/assets/vendor/
###< symfony/asset-mapper ###

###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###
56 changes: 28 additions & 28 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"type": "project",
"description": "Symfony Demo Application",
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true,
"replace": {
"symfony/polyfill-php72": "*",
Expand All @@ -22,30 +22,30 @@
"doctrine/orm": "^3.0",
"league/commonmark": "^2.1",
"symfony/apache-pack": "^1.0",
"symfony/asset": "7.1.*",
"symfony/asset-mapper": "7.1.*",
"symfony/console": "7.1.*",
"symfony/dotenv": "7.1.*",
"symfony/expression-language": "7.1.*",
"symfony/asset": "^7",
"symfony/asset-mapper": "^7",
"symfony/console": "^7",
"symfony/dotenv": "^7",
"symfony/expression-language": "^7",
"symfony/flex": "^2",
"symfony/form": "7.1.*",
"symfony/framework-bundle": "7.1.*",
"symfony/html-sanitizer": "7.1.*",
"symfony/http-client": "7.1.*",
"symfony/intl": "7.1.*",
"symfony/mailer": "7.1.*",
"symfony/form": "^7",
"symfony/framework-bundle": "^7",
"symfony/html-sanitizer": "^7",
"symfony/http-client": "^7",
"symfony/intl": "^7",
"symfony/mailer": "^7",
"symfony/monolog-bundle": "^3.7",
"symfony/polyfill-intl-messageformatter": "^1.12",
"symfony/runtime": "7.1.*",
"symfony/security-bundle": "7.1.*",
"symfony/runtime": "^7",
"symfony/security-bundle": "^7",
"symfony/stimulus-bundle": "^2.12",
"symfony/string": "7.1.*",
"symfony/translation": "7.1.*",
"symfony/twig-bundle": "7.1.*",
"symfony/string": "^7",
"symfony/translation": "^7",
"symfony/twig-bundle": "^7",
"symfony/ux-live-component": "^2.6",
"symfony/validator": "7.1.*",
"symfony/yaml": "7.1.*",
"symfonycasts/sass-bundle": "^0.3",
"symfony/validator": "^7",
"symfony/yaml": "^7",
"symfonycasts/sass-bundle": "^0.7",
"twig/extra-bundle": "^3.3",
"twig/intl-extra": "^3.3",
"twig/markdown-extra": "^3.3"
Expand All @@ -57,14 +57,14 @@
"phpstan/phpstan": "^1.2",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-symfony": "^1.2",
"symfony/browser-kit": "7.1.*",
"symfony/css-selector": "7.1.*",
"symfony/debug-bundle": "7.1.*",
"symfony/browser-kit": "^7",
"symfony/css-selector": "^7",
"symfony/debug-bundle": "^7",
"symfony/maker-bundle": "^1.36",
"symfony/phpunit-bridge": "7.1.*",
"symfony/stopwatch": "7.1.*",
"symfony/web-profiler-bundle": "7.1.*",
"twbs/bootstrap": "^4.5.3"
"symfony/phpunit-bridge": "^7",
"symfony/stopwatch": "^7",
"symfony/web-profiler-bundle": "^7",
"twbs/bootstrap": "^5"
},
"config": {
"allow-plugins": {
Expand Down Expand Up @@ -107,7 +107,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "7.1.*"
"require": "7.2.*"
}
}
}
Loading

0 comments on commit eba4f92

Please sign in to comment.