bug #28005 [HttpKernel] Fixed templateExists on parse error of the template name (yceruto)

fabpot · fabpot · commit b2ec4aaf7617 · 2018-07-23T10:31:26.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [HttpKernel] Fixed templateExists on parse error of the template name | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28001 | License | MIT | Doc PR | - https://github.com/symfony/symfony/blob/9bfa971bc5662a6f90408b58a7b2453d7dae4f83/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php#L49-L51 Commits ------- 53347c4 Fixed templateExists on parse error of the template name
diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
@@ -135,7 +135,7 @@ private function templateExists($template)
         if ($this->templating instanceof EngineInterface) {
             try {
                 return $this->templating->exists($template);
-            } catch (\InvalidArgumentException $e) {
+            } catch (\Exception $e) {
                 return false;
             }
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -86,4 +86,17 @@ public function testRenderWithDefaultText()
         $strategy = new HIncludeFragmentRenderer($engine);
         $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default'))->getContent());
     }
+
+    public function testRenderWithEngineAndDefaultText()
+    {
+        $engine = $this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
+        $engine->expects($this->once())
+            ->method('exists')
+            ->with('loading...')
+            ->will($this->throwException(new \RuntimeException()));
+
+        // only default
+        $strategy = new HIncludeFragmentRenderer($engine);
+        $this->assertEquals('<hx:include src="/foo">loading...</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'loading...'))->getContent());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ private function templateExists($template)`
`135`	`135`	`if ($this->templating instanceof EngineInterface) {`
`136`	`136`	`try {`
`137`	`137`	`return $this->templating->exists($template);`
`138`		`- } catch (\InvalidArgumentException $e) {`
	`138`	`+ } catch (\Exception $e) {`
`139`	`139`	`return false;`
`140`	`140`	`}`
`141`	`141`	`}`