symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
+5-5Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -231,18 +231,18 @@ protected function renderView($view, array $parameters = array())
     protected function render($view, array $parameters = array(), Response $response = null)
     {
         if ($this->container->has('templating')) {
-            return $this->container->get('templating')->renderResponse($view, $parameters, $response);
-        }
-
-        if (!$this->container->has('twig')) {
+            $content = $this->container->get('templating')->render($view, $parameters);
+        } elseif ($this->container->has('twig')) {
+            $content = $this->container->get('twig')->render($view, $parameters);
+        } else {
             throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available.');
         }
 
         if (null === $response) {
             $response = new Response();
         }
 
-        $response->setContent($this->container->get('twig')->render($view, $parameters));
+        $response->setContent($content);
 
         return $response;
     }
 
@@ -451,7 +451,7 @@ public function testRenderViewTemplating()
     public function testRenderTemplating()
     {
         $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
-        $templating->expects($this->once())->method('renderResponse')->willReturn(new Response('bar'));
+        $templating->expects($this->once())->method('render')->willReturn('bar');
 
         $container = new Container();
         $container->set('templating', $templating);
Original file line number	Diff line number	Diff line change
`@@ -231,18 +231,18 @@ protected function renderView($view, array $parameters = array())`
`231`	`231`	`protected function render($view, array $parameters = array(), Response $response = null)`
`232`	`232`	`{`
`233`	`233`	`if ($this->container->has('templating')) {`
`234`		`- return $this->container->get('templating')->renderResponse($view, $parameters, $response);`
`235`		`- }`
`236`		`-`
`237`		`- if (!$this->container->has('twig')) {`
	`234`	`+ $content = $this->container->get('templating')->render($view, $parameters);`
	`235`	`+ } elseif ($this->container->has('twig')) {`
	`236`	`+ $content = $this->container->get('twig')->render($view, $parameters);`
	`237`	`+ } else {`
`238`	`238`	`throw new \LogicException('You can not use the "render" method if the Templating Component or the Twig Bundle are not available.');`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`if (null === $response) {`
`242`	`242`	`$response = new Response();`
`243`	`243`	`}`
`244`	`244`
`245`		`- $response->setContent($this->container->get('twig')->render($view, $parameters));`
	`245`	`+ $response->setContent($content);`
`246`	`246`
`247`	`247`	`return $response;`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ public function testRenderViewTemplating()`
`451`	`451`	`public function testRenderTemplating()`
`452`	`452`	`{`
`453`	`453`	`$templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();`
`454`		`- $templating->expects($this->once())->method('renderResponse')->willReturn(new Response('bar'));`
	`454`	`+ $templating->expects($this->once())->method('render')->willReturn('bar');`
`455`	`455`
`456`	`456`	`$container = new Container();`
`457`	`457`	`$container->set('templating', $templating);`