Added WebProfilerBundle integration

yceruto · yceruto · commit f97f94e15f90 · 2019-05-08T17:37:37.000-04:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\WebProfilerBundle\Controller;
 
-use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -30,14 +30,18 @@ class ExceptionController
     protected $twig;
     protected $debug;
     protected $profiler;
+    private $charset;
     private $fileLinkFormat;
+    private $errorRenderer;
 
-    public function __construct(Profiler $profiler = null, Environment $twig, bool $debug, FileLinkFormatter $fileLinkFormat = null)
+    public function __construct(Profiler $profiler = null, Environment $twig, bool $debug, FileLinkFormatter $fileLinkFormat = null, string $charset = null, HtmlErrorRenderer $errorRenderer = null)
     {
         $this->profiler = $profiler;
         $this->twig = $twig;
         $this->debug = $debug;
+        $this->charset = $charset;
         $this->fileLinkFormat = $fileLinkFormat;
+        $this->errorRenderer = $errorRenderer;
     }
 
     /**
@@ -61,9 +65,11 @@ public function showAction($token)
         $template = $this->getTemplate();
 
         if (!$this->twig->getLoader()->exists($template)) {
-            $handler = new ExceptionHandler($this->debug, $this->twig->getCharset(), $this->fileLinkFormat);
+            if (null === $this->errorRenderer) {
+                $this->errorRenderer = new HtmlErrorRenderer($this->debug, $this->charset, $this->fileLinkFormat);
+            }
 
-            return new Response($handler->getContent($exception), 200, ['Content-Type' => 'text/html']);
+            return new Response($this->errorRenderer->getBody($exception), 200, ['Content-Type' => 'text/html']);
         }
 
         $code = $exception->getStatusCode();
@@ -97,13 +103,14 @@ public function cssAction($token)
 
         $this->profiler->disable();
 
-        $exception = $this->profiler->loadProfile($token)->getCollector('exception')->getException();
         $template = $this->getTemplate();
 
         if (!$this->templateExists($template)) {
-            $handler = new ExceptionHandler($this->debug, $this->twig->getCharset(), $this->fileLinkFormat);
+            if (null === $this->errorRenderer) {
+                $this->errorRenderer = new HtmlErrorRenderer($this->debug, $this->charset, $this->fileLinkFormat);
+            }
 
-            return new Response($handler->getStylesheet($exception), 200, ['Content-Type' => 'text/css']);
+            return new Response($this->errorRenderer->getStylesheet(), 200, ['Content-Type' => 'text/css']);
         }
 
         return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, ['Content-Type' => 'text/css']);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
@@ -27,6 +27,8 @@
             <argument type="service" id="twig" />
             <argument>%kernel.debug%</argument>
             <argument type="service" id="debug.file_link_formatter" />
+            <argument>%kernel.charset%</argument>
+            <argument type="service" id="error_handler.renderer.html" on-invalid="null" />
         </service>
 
         <service id="web_profiler.csp.handler" class="Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler">
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
@@ -53,6 +54,7 @@ protected function setUp()
         $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
 
         $this->container = new ContainerBuilder();
+        $this->container->register('error_handler.renderer.html', HtmlErrorRenderer::class);
         $this->container->register('event_dispatcher', EventDispatcher::class)->setPublic(true);
         $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'))->setPublic(true);
         $this->container->register('twig', 'Twig\Environment')->setPublic(true);
