merged branch zachbadgett/framework_bundle_delegating_engine (PR symfony#4824)

fabpot · fabpot · commit 2c6b8250682b · 2012-07-10T08:42:11.000+02:00
Commits ------- 2fa98e8 [FrameworkBundle] Changed DelegatingEngine::renderResponse to use specified engine's renderResponse Discussion ---------- [FrameworkBundle] Changed DelegatingEngine::renderResponse to use specified engine's renderResponse Currently the DelegatingEngine in the FrameworkBundle has a renderResponse method that creates a new response, it should use the engine's renderResponse since EngineInterface requires a renderResponse to be defined and gives more flexibly to change the response object when creating a new templating engine. Bug fix: no Feature addition: yes Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - License of the code: MIT Documentation PR: -
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php
@@ -84,12 +84,6 @@ protected function getEngine($name)
      */
     public function renderResponse($view, array $parameters = array(), Response $response = null)
     {
-        if (null === $response) {
-            $response = new Response();
-        }
-
-        $response->setContent($this->render($view, $parameters));
-
-        return $response;
+        return $this->getEngine($view)->renderResponse($view, $parameters, $response);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,6 @@ protected function getEngine($name)`
`84`	`84`	`*/`
`85`	`85`	`public function renderResponse($view, array $parameters = array(), Response $response = null)`
`86`	`86`	`{`
`87`		`- if (null === $response) {`
`88`		`- $response = new Response();`
`89`		`- }`
`90`		`-`
`91`		`- $response->setContent($this->render($view, $parameters));`
`92`		`-`
`93`		`- return $response;`
	`87`	`+ return $this->getEngine($view)->renderResponse($view, $parameters, $response);`
`94`	`88`	`}`
`95`	`89`	`}`