Skip to content

Commit d1ea1ae

Browse files
authored
Merge branch 'master' into chore(env)/bug-with-sudoers
2 parents 1ecf32f + b03778f commit d1ea1ae

File tree

19 files changed

+173
-169
lines changed

19 files changed

+173
-169
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"gedmo/doctrine-extensions": "3.13.0",
3434
"lexik/jwt-authentication-bundle": "2.19.1",
3535
"mark-gerarts/automapper-plus-bundle": "1.4.1",
36-
"matomo/device-detector": "6.1.5",
36+
"matomo/device-detector": "6.1.6",
3737
"matthiasnoback/symfony-console-form": "5.3.2",
3838
"nelmio/api-doc-bundle": "4.12.0",
3939
"nelmio/cors-bundle": "2.3.1",

composer.lock

Lines changed: 21 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/packages/doctrine.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ doctrine:
1212
EnumLanguage: App\Doctrine\DBAL\Types\EnumLanguageType
1313
EnumLocale: App\Doctrine\DBAL\Types\EnumLocaleType
1414
EnumLogLogin: App\Doctrine\DBAL\Types\EnumLogLoginType
15-
15+
profiling_collect_backtrace: '%kernel.debug%'
1616
# IMPORTANT: You MUST configure your server version,
1717
# either here or in the DATABASE_URL env var (see .env file)
1818
#server_version: '15'
19-
2019
orm:
2120
auto_generate_proxy_classes: true
2221
enable_lazy_ghost_objects: true
22+
report_fields_where_declared: true
23+
validate_xml_mapping: true
2324
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
2425
auto_mapping: true
2526
mappings:

config/packages/translation.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ framework:
1111
# dsn: '%env(LOCO_DSN)%'
1212
# lokalise:
1313
# dsn: '%env(LOKALISE_DSN)%'
14+
# phrase:
15+
# dsn: '%env(PHRASE_DSN)%'

symfony.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"version": "v0.5.3"
3838
},
3939
"doctrine/doctrine-bundle": {
40-
"version": "2.8",
40+
"version": "2.10",
4141
"recipe": {
4242
"repo": "github.com/symfony/recipes",
4343
"branch": "main",
44-
"version": "2.8",
45-
"ref": "6b43b7b6ff6bf2551f2933ebeb66721fa3db8fbc"
44+
"version": "2.10",
45+
"ref": "e025a6cb69b195970543820b2f18ad21724473fa"
4646
},
4747
"files": [
4848
"config/packages/doctrine.yaml",
@@ -438,12 +438,12 @@
438438
"version": "v5.1.0"
439439
},
440440
"symfony/translation": {
441-
"version": "5.3",
441+
"version": "6.3",
442442
"recipe": {
443443
"repo": "github.com/symfony/recipes",
444-
"branch": "master",
445-
"version": "5.3",
446-
"ref": "da64f5a2b6d96f5dc24914517c0350a5f91dee43"
444+
"branch": "main",
445+
"version": "6.3",
446+
"ref": "64fe617084223633e1dedf9112935d8c95410d3e"
447447
},
448448
"files": [
449449
"config/packages/translation.yaml",
@@ -457,12 +457,12 @@
457457
"version": "v4.4.3"
458458
},
459459
"symfony/twig-bundle": {
460-
"version": "6.1",
460+
"version": "6.3",
461461
"recipe": {
462462
"repo": "github.com/symfony/recipes",
463463
"branch": "main",
464-
"version": "5.4",
465-
"ref": "bb2178c57eee79e6be0b297aa96fc0c0def81387"
464+
"version": "6.3",
465+
"ref": "b7772eb20e92f3fb4d4fe756e7505b4ba2ca1a2c"
466466
},
467467
"files": [
468468
"config/packages/twig.yaml",

tools/01_phpunit/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require-dev": {
88
"liuggio/fastest": "1.11.0",
9-
"phpunit/php-code-coverage": "10.1.6",
9+
"phpunit/php-code-coverage": "10.1.7",
1010
"phpunit/phpcov": "9.0.2",
1111
"phpunit/phpunit": "10.0.19",
1212
"roave/security-advisories": "dev-latest",

tools/01_phpunit/composer.lock

Lines changed: 22 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/02_phpstan/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"php": "^8.2.0"
66
},
77
"require-dev": {
8-
"phpstan/phpstan": "1.10.36",
8+
"phpstan/phpstan": "1.10.37",
99
"phpstan/phpstan-phpunit": "1.3.14",
1010
"phpstan/phpstan-symfony": "1.3.4",
1111
"roave/security-advisories": "dev-latest"

0 commit comments

Comments
 (0)