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
symfony · Oct 2, 2023 · cbbf5e7 · cbbf5e7
2 parents fefc61e + cdc7896
commit cbbf5e7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/Cropperjs/composer.json b/src/Cropperjs/composer.json
@@ -38,6 +38,7 @@
         "symfony/validator": "^5.4|^6.0"
     },
     "require-dev": {
+        "symfony/expression-language": "^5.4|^6.0",
         "symfony/framework-bundle": "^5.4|^6.0",
         "symfony/phpunit-bridge": "^5.4|^6.0",
         "symfony/twig-bundle": "^5.4|^6.0",

diff --git a/src/LiveComponent/composer.json b/src/LiveComponent/composer.json
@@ -40,6 +40,7 @@
         "doctrine/persistence": "^2.5.2|^3.0",
         "phpdocumentor/reflection-docblock": "5.x-dev",
         "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/expression-language": "^5.4|^6.0",
         "symfony/form": "^5.4|^6.0",
         "symfony/options-resolver": "^5.4|^6.0",
         "symfony/framework-bundle": "^5.4|^6.0",

diff --git a/src/LiveComponent/tests/Fixtures/Kernel.php b/src/LiveComponent/tests/Fixtures/Kernel.php
@@ -83,15 +83,32 @@ public function process(ContainerBuilder $container): void
 
     protected function configureContainer(ContainerConfigurator $c): void
     {
-        $c->extension('framework', [
+        $frameworkConfig = [
             'secret' => 'S3CRET',
             'test' => true,
             'router' => ['utf8' => true],
             'secrets' => false,
             'session' => ['storage_factory_id' => 'session.storage.factory.mock_file'],
             'http_method_override' => false,
             'property_info' => ['enabled' => true],
-        ]);
+            'php_errors' => ['log' => true],
+            'validation' => [
+                'email_validation_mode' => 'html5',
+            ],
+        ];
+
+        if (self::VERSION_ID >= 60400) {
+            $frameworkConfig['handle_all_throwables'] = true;
+            $frameworkConfig['session'] = [
+                'storage_factory_id' => 'session.storage.factory.mock_file',
+                'cookie_secure' => 'auto',
+                'cookie_samesite' => 'lax',
+                'handler_id' => null,
+            ];
+            $frameworkConfig['annotations']['enabled'] = false;
+        }
+
+        $c->extension('framework', $frameworkConfig);
 
         $c->extension('twig', [
             'default_path' => '%kernel.project_dir%/tests/Fixtures/templates',