Compatibility with Twig 1.27

xkobal · fabpot · commit 77c5395a7932 · 2016-10-27T07:46:29.000-07:00
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -58,6 +58,7 @@ public function exists($name)
      * Otherwise the template is located using the locator from the twig library.
      *
      * @param string|TemplateReferenceInterface $template The template
+     * @param bool                              $throw    When true, a \Twig_Error_Loader exception will be thrown if a template could not be found
      *
      * @return string The path to the template file
      *
@@ -87,7 +88,11 @@ protected function findTemplate($template, $throw = true)
         }
 
         if (false === $file || null === $file) {
-            throw $twigLoaderException;
+            if ($throw) {
+                throw $twigLoaderException;
+            }
+
+            return false;
         }
 
         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
@@ -115,4 +115,17 @@ public function testTwigErrorIfTemplateDoesNotExist()
         $method->setAccessible(true);
         $method->invoke($loader, 'name.format.engine');
     }
+    
+    public function testTwigSoftErrorIfTemplateDoesNotExist()
+    {
+        $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);
+        $this->assertFalse($method->invoke($loader, 'name.format.engine', false));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public function exists($name)`
`58`	`58`	`* Otherwise the template is located using the locator from the twig library.`
`59`	`59`	`*`
`60`	`60`	`* @param string\|TemplateReferenceInterface $template The template`
	`61`	`+ * @param bool $throw When true, a \Twig_Error_Loader exception will be thrown if a template could not be found`
`61`	`62`	`*`
`62`	`63`	`* @return string The path to the template file`
`63`	`64`	`*`
`@@ -87,7 +88,11 @@ protected function findTemplate($template, $throw = true)`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`if (false === $file \|\| null === $file) {`
`90`		`- throw $twigLoaderException;`
	`91`	`+ if ($throw) {`
	`92`	`+ throw $twigLoaderException;`
	`93`	`+ }`
	`94`	`+`
	`95`	`+ return false;`
`91`	`96`	`}`
`92`	`97`
`93`	`98`	`return $this->cache[$logicalName] = $file;`