bug #17434 Improved the error message when a template is not found (rvanginneken, javiereguiluz)

fabpot · fabpot · commit 37569be45f4d · 2016-03-03T15:31:15.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- Improved the error message when a template is not found | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | #14806 | License | MIT | Doc PR | - ### Before ![template_error_before](https://cloud.githubusercontent.com/assets/73419/12414237/7db29212-be94-11e5-85b4-c6444aa853f8.png) ### After ![template_error_after](https://cloud.githubusercontent.com/assets/73419/12414242/80ed1eca-be94-11e5-992e-a0596a1e95ca.png) This seems to work in the browser ... but I can't make tests pass. Could anybody please help me? Thanks! Commits ------- 0134d76 Simplified everything 19bfa2e Added a test 88b913b Fixed the problem in an easier way 35f082f Fixed a syntax issue 968476b Improved the error message when a template is not found e9d951a [CodingStandards] Conformed to coding standards d3fe07b [TwigBundle] fixed Include file locations in "Template could not be found" exception
diff --git 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
@@ -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');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,19 +77,18 @@ protected function findTemplate($template, $throw = true)`
`77`	`77`	`try {`
`78`	`78`	`$file = parent::findTemplate($logicalName);`
`79`	`79`	`} catch (\Twig_Error_Loader $e) {`
`80`		`- $previous = $e;`
	`80`	`+ $twigLoaderException = $e;`
`81`	`81`
`82`	`82`	`// for BC`
`83`	`83`	`try {`
`84`	`84`	`$template = $this->parser->parse($template);`
`85`	`85`	`$file = $this->locator->locate($template);`
`86`	`86`	`} catch (\Exception $e) {`
`87`		`- $previous = $e;`
`88`	`87`	`}`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`if (false === $file \|\| null === $file) {`
`92`		`- throw new \Twig_Error_Loader(sprintf('Unable to find template "%s".', $logicalName), -1, null, $previous);`
	`91`	`+ throw $twigLoaderException;`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`return $this->cache[$logicalName] = $file;`