Merge 3.1

api-platform · Sep 8, 2023 · 731ceac · 731ceac
2 parents 92f2db9 + c9bc72c
commit 731ceac
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
         "symfony/property-access": "^6.1",
         "symfony/property-info": "^6.1",
         "symfony/serializer": "^6.1",
+        "symfony/translation-contracts": "^3.3",
         "symfony/web-link": "^6.1",
         "willdurand/negotiation": "^3.0"
     },

diff --git a/tests/Fixtures/app/AppKernel.php b/tests/Fixtures/app/AppKernel.php
@@ -34,6 +34,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRendererInterface;
+use Symfony\Component\HttpClient\Messenger\PingWebhookMessageHandler;
 use Symfony\Component\HttpFoundation\Session\SessionFactory;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\PasswordHasher\Hasher\NativePasswordHasher;
@@ -112,21 +113,45 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
             ],
         ];
 
-        $c->prependExtensionConfig('framework', [
-            'secret' => 'dunglas.fr',
-            'validation' => ['enable_annotations' => true],
-            'serializer' => ['enable_annotations' => true],
-            'test' => null,
-            'session' => class_exists(SessionFactory::class) ? ['storage_factory_id' => 'session.storage.factory.mock_file'] : ['storage_id' => 'session.storage.mock_file'],
-            'profiler' => [
-                'enabled' => true,
-                'collect' => false,
-            ],
-            'messenger' => $messengerConfig,
-            'router' => ['utf8' => true],
-            'http_method_override' => false,
-            'annotations' => false,
-        ]);
+        // This class is introduced in Symfony 6.4 just using it to use the new configuration and to avoid unnecessary deprecations
+        if (class_exists(PingWebhookMessageHandler::class)) {
+            $config = [
+                'secret' => 'dunglas.fr',
+                'validation' => ['enable_attributes' => true, 'email_validation_mode' => 'html5'],
+                'serializer' => ['enable_attributes' => true],
+                'test' => null,
+                'session' => ['cookie_secure' => true, 'cookie_samesite' => 'lax', 'handler_id' => 'session.handler.native_file'],
+                'profiler' => [
+                    'enabled' => true,
+                    'collect' => false,
+                ],
+                'php_errors' => ['log' => true],
+                'messenger' => $messengerConfig,
+                'router' => ['utf8' => true],
+                'http_method_override' => false,
+                'annotations' => false,
+                'handle_all_throwables' => true,
+                'uid' => ['default_uuid_version' => 7, 'time_based_uuid_version' => 7],
+            ];
+        } else {
+            $config = [
+                'secret' => 'dunglas.fr',
+                'validation' => ['enable_annotations' => true],
+                'serializer' => ['enable_annotations' => true],
+                'test' => null,
+                'session' => class_exists(SessionFactory::class) ? ['storage_factory_id' => 'session.storage.factory.mock_file'] : ['storage_id' => 'session.storage.mock_file'],
+                'profiler' => [
+                    'enabled' => true,
+                    'collect' => false,
+                ],
+                'messenger' => $messengerConfig,
+                'router' => ['utf8' => true],
+                'http_method_override' => false,
+                'annotations' => false,
+            ];
+        }
+
+        $c->prependExtensionConfig('framework', $config);
 
         $alg = class_exists(NativePasswordHasher::class, false) || class_exists('Symfony\Component\Security\Core\Encoder\NativePasswordEncoder') ? 'auto' : 'bcrypt';
         $securityConfig = [