-
Notifications
You must be signed in to change notification settings - Fork 703
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
moved all twig related aspects of the ExceptionController into a new …
…TwigExceptionController
- Loading branch information
Showing
5 changed files
with
180 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the FOSRestBundle package. | ||
| * | ||
| * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace FOS\RestBundle\Controller; | ||
|
|
||
| use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface; | ||
| use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference; | ||
| use Symfony\Component\Debug\Exception\FlattenException; | ||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\HttpFoundation\Response; | ||
| use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; | ||
|
|
||
| /** | ||
| * Custom ExceptionController that uses the view layer and supports HTTP response status code mapping. | ||
| * It additionally is able to prepare the template parameters for the core EngineInterface. | ||
| */ | ||
| class TwigExceptionController extends ExceptionController | ||
| { | ||
| /** | ||
| * @var EngineInterface | ||
| */ | ||
| private $templating; | ||
|
|
||
| public function setTemplating(EngineInterface $templating) | ||
| { | ||
| $this->templating = $templating; | ||
| } | ||
|
|
||
| public function getTemplating() | ||
| { | ||
| if (!$this->templating instanceof EngineInterface) { | ||
| throw new \RuntimeException('No templating engine set'); | ||
| } | ||
|
|
||
| return $this->templating; | ||
| } | ||
|
|
||
| /** | ||
| * {inheritDoc}. | ||
| */ | ||
| protected function createView($format, FlattenException $exception, $code, $parameters, Request $request, $showException) | ||
| { | ||
| $view = parent::createView($format, $exception, $code, $parameters, $request, $showException); | ||
|
|
||
| if ($this->getViewHandler()->isFormatTemplating($format)) { | ||
| $view->setTemplate($this->findTemplate($request, $format, $code, $showException)); | ||
| $view->setData($parameters); | ||
| } | ||
|
|
||
| return $view; | ||
| } | ||
|
|
||
| /** | ||
| * {inheritDoc}. | ||
| */ | ||
| protected function getParameters($currentContent, $code, $exception, DebugLoggerInterface $logger = null, $format = 'html') | ||
| { | ||
| $parameters = parent::getParameters($currentContent, $code, $exception, $logger, $format); | ||
|
|
||
| if ($this->getViewHandler()->isFormatTemplating($format)) { | ||
| $parameters['logger'] = $logger; | ||
| } | ||
|
|
||
| return $parameters; | ||
| } | ||
|
|
||
| /** | ||
| * Finds the template for the given format and status code. | ||
| * | ||
| * Note this method needs to be overridden in case another | ||
| * engine than Twig should be supported; | ||
| * | ||
| * This code is inspired by TwigBundle and should be synchronized on a regular basis | ||
| * see src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php | ||
| * | ||
| * @param Request $request | ||
| * @param string $format | ||
| * @param int $statusCode | ||
| * @param bool $showException | ||
| * | ||
| * @return TemplateReference | ||
| */ | ||
| protected function findTemplate(Request $request, $format, $statusCode, $showException) | ||
| { | ||
| $name = $showException ? 'exception' : 'error'; | ||
| if ($showException && 'html' == $format) { | ||
| $name = 'exception_full'; | ||
| } | ||
|
|
||
| // when not in debug, try to find a template for the specific HTTP status code and format | ||
| if (!$showException) { | ||
| $template = new TemplateReference('TwigBundle', 'Exception', $name.$statusCode, $format, 'twig'); | ||
| if ($this->getTemplating()->exists($template)) { | ||
| return $template; | ||
| } | ||
| } | ||
|
|
||
| // try to find a template for the given format | ||
| $template = new TemplateReference('TwigBundle', 'Exception', $name, $format, 'twig'); | ||
| if ($this->getTemplating()->exists($template)) { | ||
| return $template; | ||
| } | ||
|
|
||
| // default to a generic HTML exception | ||
| $request->setRequestFormat('html'); | ||
|
|
||
| return new TemplateReference('TwigBundle', 'Exception', $showException ? 'exception_full' : $name, 'html', 'twig'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22d0f1fThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
after update I got this error
You have requested a non-existent service "fos_rest.exception.twig_controller"
What should I change?
22d0f1fThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@phoenixgao There's nothing you can do right now than switching back to a version not containing this commit. But we are aware of this and will fix it soon.
22d0f1fThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see also #1288 (comment)