Changes according to reviews

javiereguiluz · javiereguiluz · commit a043bf79708e · 2024-10-09T17:12:24.000+02:00
diff --git a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php
@@ -37,7 +37,7 @@ public function __construct(
         ?ErrorRendererInterface $fallbackErrorRenderer = null,
         bool|callable $debug = false,
     ) {
-        $this->fallbackErrorRenderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) ? new CliErrorRenderer() : ($fallbackErrorRenderer ?? new HtmlErrorRenderer());
+        $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();
         $this->debug = \is_bool($debug) ? $debug : $debug(...);
     }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/ErrorRenderer/TwigErrorRendererTest.php b/src/Symfony/Bridge/Twig/Tests/ErrorRenderer/TwigErrorRendererTest.php
@@ -14,25 +14,25 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\ErrorRenderer\TwigErrorRenderer;
 use Symfony\Component\ErrorHandler\ErrorRenderer\CliErrorRenderer;
+use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
 
 class TwigErrorRendererTest extends TestCase
 {
-    public function testDontUseNativeRenderInCliContext()
+    public function tesFallbackRenderer()
     {
-        $exception = new \Exception();
-
         $twig = $this->createMock(Environment::class);
-        $nativeRenderer = $this->createMock(CliErrorRenderer::class);
-        $nativeRenderer
-            ->expects($this->never())
-            ->method('render')
-            ->with($exception)
-        ;
-
-        (new TwigErrorRenderer($twig, $nativeRenderer, true))->render(new \Exception());
+        $customRenderer = new class implements ErrorRendererInterface {
+            public function render(\Throwable $exception): FlattenException
+            {
+                return 'This is a custom error renderer.';
+            }
+        };
+
+        $this->assertSame('This is a custom error renderer.', (new TwigErrorRenderer($twig, $customRenderer, true))->render(new \Exception()));
     }
 
     public function testCliRenderer()
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -42,6 +42,7 @@ public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('twig.php');
+        $loader->load('twig_test.php');
 
         if (method_exists(Environment::class, 'resetGlobals')) {
             $container->getDefinition('twig')->addTag('kernel.reset', ['method' => 'resetGlobals']);
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig_test.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig_test.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Bridge\Twig\ErrorRenderer\TwigErrorRenderer;
+use Symfony\Component\ErrorHandler\ErrorRenderer\CliErrorRenderer;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('twig.error_renderer.html', TwigErrorRenderer::class)
+        ->decorate('error_renderer.html')
+        ->args([
+            service('twig'),
+            inline_service(CliErrorRenderer::class),
+            inline_service('bool')
+                ->factory([TwigErrorRenderer::class, 'isDebug'])
+                ->args([service('request_stack'), param('kernel.debug')]),
+        ])
+    ;
+};

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(`
`37`	`37`	`?ErrorRendererInterface $fallbackErrorRenderer = null,`
`38`	`38`	`bool\|callable $debug = false,`
`39`	`39`	`) {`
`40`		`- $this->fallbackErrorRenderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) ? new CliErrorRenderer() : ($fallbackErrorRenderer ?? new HtmlErrorRenderer());`
	`40`	`+ $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();`
`41`	`41`	`$this->debug = \is_bool($debug) ? $debug : $debug(...);`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public function load(array $configs, ContainerBuilder $container): void`
`42`	`42`	`{`
`43`	`43`	`$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));`
`44`	`44`	`$loader->load('twig.php');`
	`45`	`+ $loader->load('twig_test.php');`
`45`	`46`
`46`	`47`	`if (method_exists(Environment::class, 'resetGlobals')) {`
`47`	`48`	`$container->getDefinition('twig')->addTag('kernel.reset', ['method' => 'resetGlobals']);`