bug #23283 [TwigBundle] add back exception check (xabbuh)

fabpot · fabpot · commit 73e93482376a · 2017-06-24T09:41:09.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [TwigBundle] add back exception check | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23268 | License | MIT | Doc PR | #23268 introduced a regression in that the full exception page was not shown anymore in case a template for the given format (if not `html`) could not be found. Commits ------- 46c38df [TwigBundle] add back exception check
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -125,7 +125,7 @@ protected function findTemplate(Request $request, $format, $code, $showException
         // default to a generic HTML exception
         $request->setRequestFormat('html');
 
-        return new TemplateReference('TwigBundle', 'Exception', $name, 'html', 'twig');
+        return new TemplateReference('TwigBundle', 'Exception', $showException ? 'exception_full' : $name, 'html', 'twig');
     }
 
     // to be removed when the minimum required version of Twig is >= 3.0
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
@@ -48,6 +48,20 @@ public function testFallbackToHtmlIfNoTemplateForRequestedFormat()
         $this->assertEquals('html', $request->getRequestFormat());
     }
 
+    public function testFallbackToHtmlWithFullExceptionIfNoTemplateForRequestedFormatAndExceptionsShouldBeShown()
+    {
+        $twig = $this->createTwigEnv(array('TwigBundle:Exception:exception_full.html.twig' => '<html></html>'));
+
+        $request = $this->createRequest('txt');
+        $request->attributes->set('showException', true);
+        $exception = FlattenException::create(new \Exception());
+        $controller = new ExceptionController($twig, false);
+
+        $controller->showAction($request, $exception);
+
+        $this->assertEquals('html', $request->getRequestFormat());
+    }
+
     public function testResponseHasRequestedMimeType()
     {
         $twig = $this->createTwigEnv(array('TwigBundle:Exception:error.json.twig' => '{}'));

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected function findTemplate(Request $request, $format, $code, $showException`
`125`	`125`	`// default to a generic HTML exception`
`126`	`126`	`$request->setRequestFormat('html');`
`127`	`127`
`128`		`- return new TemplateReference('TwigBundle', 'Exception', $name, 'html', 'twig');`
	`128`	`+ return new TemplateReference('TwigBundle', 'Exception', $showException ? 'exception_full' : $name, 'html', 'twig');`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// to be removed when the minimum required version of Twig is >= 3.0`