Merge pull request #91 from symfony-cmf/tweak_fos_rest_integration

improve json/xml output when params contain a single variable
symfony-cmf · Nov 26, 2013 · d27beb9 · d27beb9
2 parents dc56f11 + 4c511c2
commit d27beb9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.1.1
+-----
+
+* **2013-11-26**: Improve json/xml output when params contain a single variable
+
 1.0.0-RC3
 ---------
 

diff --git a/Controller/ContentController.php b/Controller/ContentController.php
@@ -90,7 +90,14 @@ public function indexAction(Request $request, $contentDocument, $contentTemplate
     protected function renderResponse($contentTemplate, $params)
     {
         if ($this->viewHandler) {
+            if (1 === count($params)) {
+                $templateVar = key($params);
+                $params = reset($params);
+            }
             $view = new View($params);
+            if (isset($templateVar)) {
+                $view->setTemplateVar($templateVar);
+            }
             $view->setTemplate($contentTemplate);
 
             return $this->viewHandler->handle($view);