From 3e7eebd91f77d6703d329c28d44c1ac73b2ee9ef Mon Sep 17 00:00:00 2001 From: Joe Lencioni Date: Wed, 21 Mar 2012 15:35:20 -0500 Subject: [PATCH] [TwigBundle] Improved ExceptionController docblocks Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/lencioni/symfony.png)](http://travis-ci.org/lencioni/symfony) Fixes the following tickets: - Todo: - --- .../TwigBundle/Controller/ExceptionController.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index e4ca988f51..41ae9a06ed 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -31,6 +31,8 @@ class ExceptionController extends ContainerAware * @param DebugLoggerInterface $logger A DebugLoggerInterface instance * @param string $format The format to use for rendering (html, xml, ...) * + * @return Response + * * @throws \InvalidArgumentException When the exception template does not exist */ public function showAction(FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html') @@ -59,6 +61,9 @@ class ExceptionController extends ContainerAware return $response; } + /** + * @return string + */ protected function getAndCleanOutputBuffering() { // the count variable avoids an infinite loop on @@ -74,6 +79,14 @@ class ExceptionController extends ContainerAware return $currentContent; } + /** + * @param Symfony\Bundle\TwigBundle\TwigEngine $templating + * @param string $format + * @param integer $code An HTTP response status code + * @param Boolean $debug + * + * @return TemplateReference + */ protected function findTemplate($templating, $format, $code, $debug) { $name = $debug ? 'exception' : 'error';