Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 0d86c2d

Browse filesBrowse files
committed
Fixed templateExists on parse error of the template name
1 parent b1f6021 commit 0d86c2d
Copy full SHA for 0d86c2d

File tree

3 files changed

+16
-2
lines changed
Filter options

3 files changed

+16
-2
lines changed

‎src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private function templateExists($template)
135135
if ($this->templating instanceof EngineInterface) {
136136
try {
137137
return $this->templating->exists($template);
138-
} catch (\InvalidArgumentException $e) {
138+
} catch (\Exception $e) {
139139
return false;
140140
}
141141
}

‎src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+13Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,17 @@ public function testRenderWithDefaultText()
8686
$strategy = new HIncludeFragmentRenderer($engine);
8787
$this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default'))->getContent());
8888
}
89+
90+
public function testRenderWithEngineAndDefaultText()
91+
{
92+
$engine = $this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
93+
$engine->expects($this->once())
94+
->method('exists')
95+
->with('loading...')
96+
->will($this->throwException(new \RuntimeException()));
97+
98+
// only default
99+
$strategy = new HIncludeFragmentRenderer($engine);
100+
$this->assertEquals('<hx:include src="/foo">loading...</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'loading...'))->getContent());
101+
}
89102
}

‎src/Symfony/Component/HttpKernel/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/composer.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
"symfony/stopwatch": "~2.3|~3.0.0",
3939
"symfony/templating": "~2.2|~3.0.0",
4040
"symfony/translation": "^2.0.5|~3.0.0",
41-
"symfony/var-dumper": "~2.6|~3.0.0"
41+
"symfony/var-dumper": "~2.6|~3.0.0",
42+
"twig/twig": "~1.34|~2.4"
4243
},
4344
"conflict": {
4445
"symfony/config": "<2.7",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.