Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Skeleton to Symfony 7.2 #266

Draft
wants to merge 4 commits into
base: 2.6
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

###> symfony/framework-bundle ###
APP_SECRET=c9798d38335165263bcb913df2c4a79c
###< symfony/framework-bundle ###
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@
"scheb/2fa-trusted-device": "^7.2",
"stof/doctrine-extensions-bundle": "^1.11",
"sulu/sulu": "~2.6.6",
"symfony/config": "^7.1",
"symfony/dotenv": "^7.1",
"symfony/config": "^7.2",
"symfony/dotenv": "^7.2",
"symfony/flex": "^1.17 || ^2.0",
"symfony/framework-bundle": "^7.1",
"symfony/mailer": "^7.1",
"symfony/monolog-bridge": "^7.1",
"symfony/framework-bundle": "^7.2",
"symfony/mailer": "^7.2",
"symfony/monolog-bridge": "^7.2",
"symfony/monolog-bundle": "^3.4",
"symfony/runtime": "^7.1",
"symfony/security-bundle": "^7.1",
"symfony/twig-bundle": "^7.1"
"symfony/runtime": "^7.2",
"symfony/security-bundle": "^7.2",
"symfony/twig-bundle": "^7.2"
},
"require-dev": {
"jangregor/phpstan-prophecy": "^1.0",
Expand All @@ -66,13 +66,13 @@
"phpunit/phpunit": "^9.6",
"rector/rector": "^1.0",
"sulu/sulu-rector": "^1.0",
"symfony/browser-kit": "^7.1",
"symfony/css-selector": "^7.1",
"symfony/debug-bundle": "^7.1",
"symfony/error-handler": "^7.1",
"symfony/phpunit-bridge": "^7.1",
"symfony/browser-kit": "^7.2",
"symfony/css-selector": "^7.2",
"symfony/debug-bundle": "^7.2",
"symfony/error-handler": "^7.2",
"symfony/phpunit-bridge": "^7.2",
"symfony/thanks": "^1.2",
"symfony/web-profiler-bundle": "^7.1",
"symfony/web-profiler-bundle": "^7.2",
"thecodingmachine/phpstan-strict-rules": "^1.0",
"vincentlanglet/twig-cs-fixer": "^3.0"
},
Expand Down Expand Up @@ -203,7 +203,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "7.1.*"
"require": "7.2.*"
}
}
}
11 changes: 11 additions & 0 deletions config/packages/csrf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Enable stateless CSRF protection for forms and logins/logouts
framework:
form:
# csrf_protection:
# token_id: submit
#
# csrf_protection:
# stateless_token_ids:
# - submit
# - authenticate
# - logout
Comment on lines +4 to +11
Copy link
Member Author

@alexander-schranz alexander-schranz Dec 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is enabled by default in Symfony Skeleton. Not sure if we should enable it or not.

We need to test sulu/form-bundle before merging it / enabled it. Also updates its csrf protection documentation.

3 changes: 1 addition & 2 deletions config/packages/framework.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# see https://symfony.com/doc/current/reference/configuration/framework.html
framework:
secret: '%env(APP_SECRET)%'
#csrf_protection: true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was moved to own csrf.yaml file

http_method_override: true # enable also in the index.php
http_method_override: true # enabled also in the index.php

# Enables session support. Note that the session will ONLY be started if you read or write from it.
# Remove or comment this section to explicitly disable session support.
Expand Down
31 changes: 22 additions & 9 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -204,20 +204,33 @@
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "1.0",
"ref": "146251ae39e06a95be0fe3d13c807bcf3938b172"
"version": "2.4",
"ref": "52e9754527a15e2b79d9a610f98185a1fe46622a"
},
"files": [
".env",
".env.dev"
]
},
"symfony/form": {
"version": "7.2",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "7.2",
"ref": "7d86a6723f4a623f59e2bf966b6aad2fc461d36b"
},
"files": [
".env"
"config/packages/csrf.yaml"
]
},
"symfony/framework-bundle": {
"version": "7.1",
"version": "7.2",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "7.0",
"ref": "6356c19b9ae08e7763e4ba2d9ae63043efc75db5"
"version": "7.2",
"ref": "87bcf6f7c55201f345d8895deda46d2adbdbaa89"
},
"files": [
"config/packages/cache.yaml",
Expand Down Expand Up @@ -359,12 +372,12 @@
]
},
"vincentlanglet/twig-cs-fixer": {
"version": "3.0",
"version": "3.4",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
"branch": "main",
"version": "0.6",
"ref": "e4da12a48e8138479bd24a675321bcfd84950266"
"version": "3.0",
"ref": "d42582ae1bce86fd43491d6264c738b0867f8ffe"
}
}
}
Loading