fix ci

Jean-Beru · Jean-Beru · commit b5bba1af5fd9 · 2023-08-09T22:40:40.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1287,15 +1287,15 @@ private function addPhpErrorsSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->validate()
-            ->always(function (array $v): array {
-                if (!array_key_exists('log', $v['php_errors'])) {
-                    trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.php_errors.log" config option is deprecated. It will default to "true" in 7.0.');
+                ->always(function (array $v): array {
+                    if (!array_key_exists('log', $v['php_errors'])) {
+                        trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.php_errors.log" config option is deprecated. It will default to "true" in 7.0.');
 
-                    $v['php_errors']['log'] = $this->debug;
-                }
+                        $v['php_errors']['log'] = $this->debug;
+                    }
 
-                return $v;
-            })
+                    return $v;
+                })
             ->end()
             ->children()
                 ->arrayNode('php_errors')
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -62,15 +62,20 @@ public function registerBundles(): iterable
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(function (ContainerBuilder $container) {
+            $config = [
+                'annotations' => false,
+                'http_method_override' => false,
+                'php_errors' => ['log' => true],
+                'secret' => '$ecret',
+                'form' => ['enabled' => false],
+            ];
+
+            if (Kernel::VERSION_ID >= 60400) {
+                $config['handle_all_throwables'] = true;
+            }
+
             $container
-                ->loadFromExtension('framework', [
-                    'annotations' => false,
-                    'http_method_override' => false,
-                    'handle_all_throwables' => true,
-                    'php_errors' => ['log' => true],
-                    'secret' => '$ecret',
-                    'form' => ['enabled' => false],
-                ])
+                ->loadFromExtension('framework', $config)
                 ->loadFromExtension('twig', [
                     'default_path' => __DIR__.'/templates',
                 ])
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
@@ -53,14 +53,17 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $config = [
             'annotations' => false,
             'http_method_override' => false,
-            'handle_all_throwables' => true,
             'php_errors' => ['log' => true],
             'secret' => 'foo-secret',
             'profiler' => ['only_exceptions' => false],
             'session' => ['storage_factory_id' => 'session.storage.factory.mock_file', 'cookie-secure' => 'auto', 'cookie-samesite' => 'lax'],
             'router' => ['utf8' => true],
         ];
 
+        if (Kernel::VERSION_ID >= 60400) {
+            $config['handle_all_throwables'] = true;
+        }
+
         $container->loadFromExtension('framework', $config);
 
         $container->loadFromExtension('web_profiler', [
