From 3e5d83a36ac2d7e98dc1aa4eb95e0fcf20593c56 Mon Sep 17 00:00:00 2001 From: Jan Rosier Date: Wed, 13 Aug 2025 21:33:44 +0200 Subject: [PATCH] Update flex recipes --- .editorconfig | 8 +++ .env.dev | 4 ++ .env.test | 3 -- .gitignore | 2 +- .../controllers/csrf_protection_controller.js | 2 +- config/packages/translation.yaml | 2 - config/packages/web_profiler.yaml | 4 +- phpunit.xml.dist => phpunit.dist.xml | 17 ++++--- symfony.lock | 50 +++++++++---------- 9 files changed, 52 insertions(+), 40 deletions(-) rename phpunit.xml.dist => phpunit.dist.xml (79%) diff --git a/.editorconfig b/.editorconfig index 677e36e29..66990769e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,5 @@ +# editorconfig.org + root = true [*] @@ -7,3 +9,9 @@ indent_size = 4 indent_style = space insert_final_newline = true trim_trailing_whitespace = true + +[{compose.yaml,compose.*.yaml}] +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false diff --git a/.env.dev b/.env.dev index e159a709b..5ca374965 100644 --- a/.env.dev +++ b/.env.dev @@ -1 +1,5 @@ # Define your env variables for the development environment here + +###> symfony/framework-bundle ### +# APP_SECRET= +###< symfony/framework-bundle ### diff --git a/.env.test b/.env.test index b9ebeffae..a5f73474d 100644 --- a/.env.test +++ b/.env.test @@ -1,7 +1,4 @@ # Define your env variables for the test environment here KERNEL_CLASS='App\Kernel' APP_SECRET='$ecretf0rt3st' -SYMFONY_DEPRECATIONS_HELPER=999999 -PANTHER_APP_ENV=panther -PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots DATABASE_URL=sqlite:///%kernel.project_dir%/data/database_test.sqlite diff --git a/.gitignore b/.gitignore index 23f038382..932409dc9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,6 @@ phpstan.neon ###< phpstan/phpstan ### ###> phpunit/phpunit ### -.phpunit.result.cache +/.phpunit.cache/ /phpunit.xml ###< phpunit/phpunit ### diff --git a/assets/controllers/csrf_protection_controller.js b/assets/controllers/csrf_protection_controller.js index 2811f210b..c722f024a 100644 --- a/assets/controllers/csrf_protection_controller.js +++ b/assets/controllers/csrf_protection_controller.js @@ -1,5 +1,5 @@ const nameCheck = /^[-_a-zA-Z0-9]{4,22}$/; -const tokenCheck = /^[-_\/+a-zA-Z0-9]{24,}$/; +const tokenCheck = /^[-_/+a-zA-Z0-9]{24,}$/; // Generate and double-submit a CSRF token in a form field and a cookie, as defined by Symfony's SameOriginCsrfTokenManager document.addEventListener('submit', function (event) { diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml index b14473137..399d15c16 100644 --- a/config/packages/translation.yaml +++ b/config/packages/translation.yaml @@ -5,8 +5,6 @@ framework: # Translations are defined using the ICU Message Format # See https://symfony.com/doc/current/translation/message_format.html default_path: '%kernel.project_dir%/translations' - fallbacks: - - '%app.locale%' providers: # crowdin: # dsn: '%env(CROWDIN_DSN)%' diff --git a/config/packages/web_profiler.yaml b/config/packages/web_profiler.yaml index 1e039b76d..0eac3c989 100644 --- a/config/packages/web_profiler.yaml +++ b/config/packages/web_profiler.yaml @@ -8,4 +8,6 @@ when@dev: when@test: framework: - profiler: { collect: false } + profiler: + collect: false + collect_serializer_data: true diff --git a/phpunit.xml.dist b/phpunit.dist.xml similarity index 79% rename from phpunit.xml.dist rename to phpunit.dist.xml index 4bebe2cc4..c0155f869 100644 --- a/phpunit.xml.dist +++ b/phpunit.dist.xml @@ -3,17 +3,18 @@ - - - - + + + + @@ -24,9 +25,11 @@ - src + src @@ -39,7 +42,7 @@ - + diff --git a/symfony.lock b/symfony.lock index 13799f58e..e1ea9dc39 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,11 +1,11 @@ { "dama/doctrine-test-bundle": { - "version": "8.2", + "version": "8.3", "recipe": { "repo": "github.com/symfony/recipes-contrib", "branch": "main", - "version": "7.2", - "ref": "896306d79d4ee143af9eadf9b09fd34a8c391b70" + "version": "8.3", + "ref": "dfc51177476fb39d014ed89944cde53dc3326d23" }, "files": [ "config/packages/dama_doctrine_test_bundle.yaml" @@ -21,17 +21,17 @@ } }, "doctrine/doctrine-bundle": { - "version": "2.13", + "version": "2.15", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", "version": "2.13", - "ref": "8d96c0b51591ffc26794d865ba3ee7d193438a83" + "ref": "620b57f496f2e599a6015a9fa222c2ee0a32adcb" }, "files": [ - "./config/packages/doctrine.yaml", - "./src/Entity/.gitignore", - "./src/Repository/.gitignore" + "config/packages/doctrine.yaml", + "src/Entity/.gitignore", + "src/Repository/.gitignore" ] }, "doctrine/doctrine-fixtures-bundle": { @@ -76,12 +76,12 @@ "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", - "version": "9.6", - "ref": "7364a21d87e658eb363c5020c072ecfdc12e2326" + "version": "11.1", + "ref": "c6658a60fc9d594805370eacdf542c3d6b5c0869" }, "files": [ ".env.test", - "phpunit.xml.dist", + "phpunit.dist.xml", "tests/bootstrap.php" ] }, @@ -167,7 +167,7 @@ "repo": "github.com/symfony/recipes", "branch": "main", "version": "7.3", - "ref": "a64726446f6dcf3721f192c1df35418d69b3ba92" + "ref": "5a1497d539f691b96afd45ae397ce5fe30beb4b9" }, "files": [ ".editorconfig", @@ -268,27 +268,27 @@ ] }, "symfony/stimulus-bundle": { - "version": "2.23", + "version": "2.29", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", "version": "2.20", - "ref": "3acc494b566816514a6873a89023a35440b6386d" + "ref": "e058471c5502e549c1404ebdd510099107bb5549" }, "files": [ - "./assets/bootstrap.js", - "./assets/controllers.json", - "./assets/controllers/csrf_protection_controller.js", - "./assets/controllers/hello_controller.js" + "assets/bootstrap.js", + "assets/controllers.json", + "assets/controllers/csrf_protection_controller.js", + "assets/controllers/hello_controller.js" ] }, "symfony/translation": { - "version": "7.2", + "version": "7.3", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", "version": "6.3", - "ref": "e28e27f53663cc34f0be2837aba18e3a1bef8e7b" + "ref": "620a1b84865ceb2ba304c8f8bf2a185fbf32a843" }, "files": [ "config/packages/translation.yaml", @@ -321,24 +321,24 @@ ] }, "symfony/ux-live-component": { - "version": "2.20", + "version": "2.29", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", "version": "2.6", - "ref": "73e69baf18f47740d6f58688c5464b10cdacae06" + "ref": "b7130b7b5ddc2f8994bd6149d7c093b184782f0c" }, "files": [ "config/routes/ux_live_component.yaml" ] }, "symfony/ux-twig-component": { - "version": "2.20", + "version": "2.29", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", "version": "2.13", - "ref": "67814b5f9794798b885cec9d3f48631424449a01" + "ref": "f367ae2a1faf01c503de2171f1ec22567febeead" }, "files": [ "config/packages/twig_component.yaml" @@ -362,7 +362,7 @@ "repo": "github.com/symfony/recipes", "branch": "main", "version": "7.3", - "ref": "5b2b543e13942495c0003f67780cb4448af9e606" + "ref": "a363460c1b0b4a4d0242f2ce1a843ca0f6ac9026" }, "files": [ "config/packages/web_profiler.yaml",