Skip to content

Commit cbbf5e7

Browse files
committed
minor #1153 [CI] Fix failing tests + handle 6.4 deprecations (smnandre)
This PR was squashed before being merged into the 2.x branch. Discussion ---------- [CI] Fix failing tests + handle 6.4 deprecations Commits ------- cdc7896 [CI] Fix failing tests + handle 6.4 deprecations
2 parents fefc61e + cdc7896 commit cbbf5e7

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

src/Cropperjs/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"symfony/validator": "^5.4|^6.0"
3939
},
4040
"require-dev": {
41+
"symfony/expression-language": "^5.4|^6.0",
4142
"symfony/framework-bundle": "^5.4|^6.0",
4243
"symfony/phpunit-bridge": "^5.4|^6.0",
4344
"symfony/twig-bundle": "^5.4|^6.0",

src/LiveComponent/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"doctrine/persistence": "^2.5.2|^3.0",
4141
"phpdocumentor/reflection-docblock": "5.x-dev",
4242
"symfony/dependency-injection": "^5.4|^6.0",
43+
"symfony/expression-language": "^5.4|^6.0",
4344
"symfony/form": "^5.4|^6.0",
4445
"symfony/options-resolver": "^5.4|^6.0",
4546
"symfony/framework-bundle": "^5.4|^6.0",

src/LiveComponent/tests/Fixtures/Kernel.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,32 @@ public function process(ContainerBuilder $container): void
8383

8484
protected function configureContainer(ContainerConfigurator $c): void
8585
{
86-
$c->extension('framework', [
86+
$frameworkConfig = [
8787
'secret' => 'S3CRET',
8888
'test' => true,
8989
'router' => ['utf8' => true],
9090
'secrets' => false,
9191
'session' => ['storage_factory_id' => 'session.storage.factory.mock_file'],
9292
'http_method_override' => false,
9393
'property_info' => ['enabled' => true],
94-
]);
94+
'php_errors' => ['log' => true],
95+
'validation' => [
96+
'email_validation_mode' => 'html5',
97+
],
98+
];
99+
100+
if (self::VERSION_ID >= 60400) {
101+
$frameworkConfig['handle_all_throwables'] = true;
102+
$frameworkConfig['session'] = [
103+
'storage_factory_id' => 'session.storage.factory.mock_file',
104+
'cookie_secure' => 'auto',
105+
'cookie_samesite' => 'lax',
106+
'handler_id' => null,
107+
];
108+
$frameworkConfig['annotations']['enabled'] = false;
109+
}
110+
111+
$c->extension('framework', $frameworkConfig);
95112

96113
$c->extension('twig', [
97114
'default_path' => '%kernel.project_dir%/tests/Fixtures/templates',

0 commit comments

Comments
 (0)