geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

added template file information when an error occurs during compilation

Browse Source
This commit is contained in:
Fabien Potencier
2011-04-22 16:08:07 +02:00
parent 9d88081c94
commit 1e09c7b660
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+12 -3
View File
@@ -298,11 +298,13 @@ class Twig_Environment
}
if (!class_exists($cls, false)) {
$code = $this->compileSource($this->loader->getSource($name), $name);
if (false === $cache = $this->getCacheFilename($name)) {
eval('?>'.$this->compileSource($this->loader->getSource($name), $name));
eval('?>'.$code);
} else {
if (!file_exists($cache) || ($this->isAutoReload() && !$this->loader->isFresh($name, filemtime($cache)))) {
$this->writeCacheFile($cache, $this->compileSource($this->loader->getSource($name), $name));
$this->writeCacheFile($cache, $code);
}
require_once $cache;
@@ -459,7 +461,14 @@ class Twig_Environment
*/
public function compileSource($source, $name = null)
{
return $this->compile($this->parse($this->tokenize($source, $name)));
try {
return $this->compile($this->parse($this->tokenize($source, $name)));
} catch (Twig_Error $e) {
$e->setTemplateFile($name);
throw $e;
} catch (Exception $e) {
throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $name, $e);
}
}
/**