TwigBundle: catch Throwable

fprochazka · fprochazka · commit 9df8d50aebe4 · 2016-05-12T19:32:43.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -83,6 +83,7 @@ protected function findTemplate($template, $throw = true)
                 $template = $this->parser->parse($template);
                 $file = $this->locator->locate($template);
             } catch (\Exception $e) {
+            } catch (\Throwable $e) {
             }
         }
 
diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
@@ -76,6 +76,7 @@ public function render($name, array $parameters = array())
                     // try to get the real file name of the template where the error occurred
                     $e->setTemplateFile(sprintf('%s', $this->locator->locate($this->parser->parse($e->getTemplateFile()))));
                 } catch (\Exception $e2) {
+                } catch (\Throwable $e2) {
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ protected function findTemplate($template, $throw = true)`
`83`	`83`	`$template = $this->parser->parse($template);`
`84`	`84`	`$file = $this->locator->locate($template);`
`85`	`85`	`} catch (\Exception $e) {`
	`86`	`+ } catch (\Throwable $e) {`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public function render($name, array $parameters = array())`
`76`	`76`	`// try to get the real file name of the template where the error occurred`
`77`	`77`	`$e->setTemplateFile(sprintf('%s', $this->locator->locate($this->parser->parse($e->getTemplateFile()))));`
`78`	`78`	`} catch (\Exception $e2) {`
	`79`	`+ } catch (\Throwable $e2) {`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`