Skip to content

Commit

Permalink
Allow Symfony 7 versions of packages (#246)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-schranz authored Jun 28, 2024
1 parent 8ac058b commit b247c3f
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 39 deletions.
34 changes: 17 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
"scheb/2fa-email": "^7.2",
"scheb/2fa-trusted-device": "^7.2",
"stof/doctrine-extensions-bundle": "^1.11",
"sulu/sulu": "~2.6.3",
"symfony/config": "^6.4",
"symfony/dotenv": "^6.4",
"sulu/sulu": "~2.6.3@dev",
"symfony/config": "^7.1",
"symfony/dotenv": "^7.1",
"symfony/flex": "^1.17 || ^2.0",
"symfony/framework-bundle": "^6.4",
"symfony/mailer": "^6.4",
"symfony/monolog-bridge": "^6.4",
"symfony/monolog-bundle": "^3.10",
"symfony/runtime": "^6.4",
"symfony/security-bundle": "^6.4",
"symfony/twig-bundle": "^6.4"
"symfony/framework-bundle": "^7.1",
"symfony/mailer": "^7.1",
"symfony/monolog-bridge": "^7.1",
"symfony/monolog-bundle": "^3.4",
"symfony/runtime": "^7.1",
"symfony/security-bundle": "^7.1",
"symfony/twig-bundle": "^7.1"
},
"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": "^6.4",
"symfony/css-selector": "^6.4",
"symfony/debug-bundle": "^6.4",
"symfony/error-handler": "^6.4",
"symfony/phpunit-bridge": "^6.4",
"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/thanks": "^1.2",
"symfony/web-profiler-bundle": "^6.4",
"symfony/web-profiler-bundle": "^7.1",
"thecodingmachine/phpstan-strict-rules": "^1.0"
},
"conflict": {
Expand Down Expand Up @@ -192,7 +192,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "6.4.*"
"require": "7.1.*"
}
}
}
2 changes: 1 addition & 1 deletion config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ doctrine:
prefix: 'App\Entity'
alias: App
controller_resolver:
auto_mapping: true
auto_mapping: false

when@test:
doctrine:
Expand Down
7 changes: 0 additions & 7 deletions config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,15 @@
framework:
secret: '%env(APP_SECRET)%'
#csrf_protection: true
annotations: true # required for rest routing loader to be true
http_method_override: true # enable also in the index.php
handle_all_throwables: true

# 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.
session:
handler_id: null
cookie_secure: auto
cookie_samesite: lax
name: SULUSESSID # This avoids conflicts with other applications running on the same domain

#esi: true
#fragments: true
php_errors:
log: true

when@test:
framework:
Expand Down
2 changes: 0 additions & 2 deletions config/packages/routing.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
framework:
router:
utf8: true

# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
#default_uri: http://localhost
Expand Down
2 changes: 0 additions & 2 deletions config/packages/validator.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
framework:
validation:
email_validation_mode: html5

# Enables validator auto-mapping support.
# For instance, basic validation constraints will be inferred from Doctrine's metadata.
#auto_mapping:
Expand Down
20 changes: 10 additions & 10 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "2.12",
"ref": "7b1b0b637b337f6beb895589948cd119da705524"
"ref": "7266981c201efbbe02ae53c87f8bb378e3f825ae"
},
"files": [
"config/packages/doctrine.yaml",
Expand Down Expand Up @@ -224,12 +224,12 @@
]
},
"symfony/framework-bundle": {
"version": "6.4",
"version": "7.0",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "6.4",
"ref": "a91c965766ad3ff2ae15981801643330eb42b6a5"
"version": "7.0",
"ref": "6356c19b9ae08e7763e4ba2d9ae63043efc75db5"
},
"files": [
"config/packages/cache.yaml",
Expand Down Expand Up @@ -294,12 +294,12 @@
]
},
"symfony/routing": {
"version": "6.4",
"version": "7.0",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "6.2",
"ref": "e0a11b4ccb8c9e70b574ff5ad3dfdcd41dec5aa6"
"version": "7.0",
"ref": "21b72649d5622d8f7da329ffb5afb232a023619d"
},
"files": [
"config/packages/routing.yaml",
Expand Down Expand Up @@ -346,12 +346,12 @@
]
},
"symfony/validator": {
"version": "6.4",
"version": "7.0",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "5.3",
"ref": "c32cfd98f714894c4f128bb99aa2530c1227603c"
"version": "7.0",
"ref": "8c1c4e28d26a124b0bb273f537ca8ce443472bfd"
},
"files": [
"config/packages/validator.yaml"
Expand Down

0 comments on commit b247c3f

Please sign in to comment.