diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
index 65afe2a33e3c8..2a21c30fbacab 100644
--- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
+++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -77,19 +77,18 @@ protected function findTemplate($template, $throw = true)
try {
$file = parent::findTemplate($logicalName);
} catch (\Twig_Error_Loader $e) {
- $previous = $e;
+ $twigLoaderException = $e;
// for BC
try {
$template = $this->parser->parse($template);
$file = $this->locator->locate($template);
} catch (\Exception $e) {
- $previous = $e;
}
}
if (false === $file || null === $file) {
- throw new \Twig_Error_Loader(sprintf('Unable to find template "%s".', $logicalName), -1, null, $previous);
+ throw $twigLoaderException;
}
return $this->cache[$logicalName] = $file;
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
index 3fd0888cda67c..cc993c7527784 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
@@ -98,4 +98,21 @@ public function testTwigErrorIfLocatorReturnsFalse()
$loader = new FilesystemLoader($locator, $parser);
$loader->getCacheKey('name.format.engine');
}
+
+ /**
+ * @expectedException \Twig_Error_Loader
+ * @expectedExceptionMessageRegExp /Unable to find template "name\.format\.engine" \(looked into: .*\/Tests\/Loader\/\.\.\/DependencyInjection\/Fixtures\/Resources\/views\)/
+ */
+ public function testTwigErrorIfTemplateDoesNotExist()
+ {
+ $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
+ $locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+
+ $loader = new FilesystemLoader($locator, $parser);
+ $loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views');
+
+ $method = new \ReflectionMethod('Symfony\Bundle\TwigBundle\Loader\FilesystemLoader', 'findTemplate');
+ $method->setAccessible(true);
+ $method->invoke($loader, 'name.format.engine');
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy