[HttpKernel] Add request attribute _handle_all_throwables to allow HttpKernel to handle thrown Error in addition to Exception

Author: nicolas-grekas

CHANGELOG.md

@@ -6,7 +6,7 @@ CHANGELOG
 
  * Add `resolve-env` option to `debug:config` command to display actual values of environment variables in dumped configuration
  * Add `NotificationAssertionsTrait`
- * Add option `framework.catch_all_throwables` to allow `Symfony\Component\HttpKernel\HttpKernel` to catch all kinds of `Throwable`
+ * Add option `framework.handle_all_throwables` to allow `Symfony\Component\HttpKernel\HttpKernel` to handle all kinds of `Throwable`
  * Make `AbstractController::render()` able to deal with forms and deprecate `renderForm()`
  * Deprecate the `Symfony\Component\Serializer\Normalizer\ObjectNormalizer` and
    `Symfony\Component\Serializer\Normalizer\PropertyNormalizer` autowiring aliases, type-hint against

DependencyInjection/Configuration.php

@@ -133,7 +133,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode('error_controller')
                     ->defaultValue('error_controller')
                 ->end()
-                ->booleanNode('catch_all_throwables')->defaultFalse()->info('HttpKernel will catch all kinds of \Throwable')->end()
+                ->booleanNode('handle_all_throwables')->info('HttpKernel will handle all kinds of \Throwable')->end()
             ->end()
         ;
 

DependencyInjection/FrameworkExtension.php

@@ -330,7 +330,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->getDefinition('locale_listener')->replaceArgument(3, $config['set_locale_from_accept_language']);
         $container->getDefinition('response_listener')->replaceArgument(1, $config['set_content_language_from_locale']);
-        $container->getDefinition('http_kernel')->replaceArgument(4, $config['catch_all_throwables']);
+        $container->getDefinition('http_kernel')->replaceArgument(4, $config['handle_all_throwables'] ?? false);
 
         // If the slugger is used but the String component is not available, we should throw an error
         if (!ContainerBuilder::willBeAvailable('symfony/string', SluggerInterface::class, ['symfony/framework-bundle'])) {

Test/ExceptionSubscriber.php

@@ -657,7 +657,6 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 'sanitizers' => [],
             ],
             'exceptions' => [],
-            'catch_all_throwables' => false,
         ];
     }
 }

Tests/DependencyInjection/ConfigurationTest.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-use Symfony\Bundle\FrameworkBundle\Test\ExceptionSubscriber;
-use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\UidController;
 use Symfony\Component\Uid\Ulid;
 use Symfony\Component\Uid\UuidV1;
 use Symfony\Component\Uid\UuidV4;
@@ -30,15 +28,12 @@ protected function setUp(): void
     public function testArgumentValueResolverDisabled()
     {
         $client = $this->createClient(['test_case' => 'Uid', 'root_config' => 'config_disabled.yml']);
+        $client->catchExceptions(false);
 
-        $client->request('GET', '/1/uuid-v1/'.new UuidV1());
-        $this->assertSame(500, $client->getResponse()->getStatusCode());
-        $exceptions = ExceptionSubscriber::shiftAll();
-        $this->assertCount(1, $exceptions);
-        $exception = reset($exceptions);
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\UidController::anyFormat(): Argument #1 ($userId) must be of type Symfony\Component\Uid\UuidV1, string given');
 
-        $this->assertInstanceOf(\TypeError::class, $exception);
-        $this->assertStringContainsString(UidController::class.'::anyFormat(): Argument #1 ($userId) must be of type Symfony\Component\Uid\UuidV1, string given', $exception->getMessage());
+        $client->request('GET', '/1/uuid-v1/'.new UuidV1());
     }
 
     public function testArgumentValueResolverEnabled()

Tests/Functional/UidTest.php

@@ -5,8 +5,3 @@ framework:
     http_method_override: false
     uid:
         enabled: false
-
-services:
-    Symfony\Bundle\FrameworkBundle\Test\ExceptionSubscriber:
-        tags:
-            - { name: kernel.event_subscriber }

Tests/Functional/app/Uid/config_disabled.yml

@@ -11,7 +11,6 @@ framework:
     enabled_locales: ['en', 'fr']
     session:
         storage_factory_id: session.storage.factory.mock_file
-    catch_all_throwables: true
 
 services:
     logger: { class: Psr\Log\NullLogger }

Tests/Functional/app/config/framework.yml

@@ -86,7 +86,6 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
             'http_method_override' => false,
             'secret' => '$ecret',
             'router' => ['utf8' => true],
-            'catch_all_throwables' => true,
         ]);
 
         $c->setParameter('halloween', 'Have a great day!');

Tests/Kernel/ConcreteMicroKernel.php

@@ -122,7 +122,6 @@ protected function configureContainer(ContainerConfigurator $c): void
                 $c->extension('framework', [
                     'http_method_override' => false,
                     'router' => ['utf8' => true],
-                    'catch_all_throwables' => true,
                 ]);
                 $c->services()->set('logger', NullLogger::class);
             }

Tests/Kernel/MicroKernelTraitTest.php

@@ -103,7 +103,6 @@ protected function configureContainer(ContainerConfigurator $c): void
         $c->extension('framework', [
             'http_method_override' => false,
             'router' => ['utf8' => true],
-            'catch_all_throwables' => true,
         ]);
     }
 }