Skip to content

Commit 34bbd12

Browse files
committed
bug symfony#15589 made Symfony compatible with both Twig 1.x and 2.x (fabpot)
This PR was merged into the 2.3 branch. Discussion ---------- made Symfony compatible with both Twig 1.x and 2.x Commits ------- 4de4180 made Symfony compatible with both Twig 1.x and 2.x
2 parents cc73e19 + 4de4180 commit 34bbd12

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ class StubFilesystemLoader
1919
} else {
2020
class StubFilesystemLoader extends \Twig_Loader_Filesystem
2121
{
22-
protected function findTemplate($name)
22+
protected function findTemplate($name, $throw = true)
2323
{
2424
// strip away bundle name
2525
$parts = explode(':', $name);
2626

27-
return parent::findTemplate(end($parts));
27+
return parent::findTemplate(end($parts), $throw);
2828
}
2929
}
3030
}

src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function exists($name)
6464
*
6565
* @throws \Twig_Error_Loader if the template could not be found
6666
*/
67-
protected function findTemplate($template)
67+
protected function findTemplate($template, $throw = true)
6868
{
6969
$logicalName = (string) $template;
7070

0 commit comments

Comments
 (0)