update code to the last Symfony changes

Controller/CRUDController.php

@@ -12,15 +12,12 @@
 namespace Sonata\BaseApplicationBundle\Controller;
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
-
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Form\Form;
 
-
-
-use Sonata\BaseApplicationBundle\Tool\DoctrinePager as Pager;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 class CRUDController extends Controller
 {
@@ -32,13 +29,11 @@ class CRUDController extends Controller
      *
      * @return Response with json encoded data
      */
-    public function renderJson($data)
+    public function renderJson($data, $status = 200, $headers = array())
     {
-        $response = new \Symfony\Component\HttpFoundation\Response;
-        $response->setContent(json_encode($data));
-        $response->headers->set('Content-Type', 'application/json');
-
-        return $response;
+        return new Response(json_encode($data), $status, array_merge(array(
+          'Content-Type' => 'application/json'
+        ), $headers));
     }
 
     /**
@@ -226,7 +221,7 @@ class CRUDController extends Controller
             }
 
             if ($this->get('request')->isXmlHttpRequest()) {
-                return $this->createResponse(json_encode(array('result' => 'ok', 'object_id' => $object->getId())));
+                return $this->renderJson(array('result' => 'ok', 'object_id' => $object->getId()));
             }
 
             // redirect to edit mode
@@ -323,7 +318,7 @@ class CRUDController extends Controller
     }
 
     /**
-     * @param  $action
+     * @param string $action
      * @return Knplabs\MenuBundle\Menu
      */
     public function getSideMenu($action)
@@ -336,7 +331,7 @@ class CRUDController extends Controller
     }
 
     /**
-     * @param  $action
+     * @param string $action
      * @return array
      */
     public function getBreadcrumbs($action)

Controller/CoreController.php

@@ -13,11 +13,13 @@ namespace Sonata\BaseApplicationBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpFoundation\Response;
 
 use Sonata\BaseApplicationBundle\Form\RecursiveFieldIterator;
 
 class CoreController extends Controller
 {
+
     public function getBaseTemplate()
     {        
         if ($this->get('request')->isXmlHttpRequest()) {
@@ -46,7 +48,7 @@ class CoreController extends Controller
         $extension = $twig->getExtension('form');
         $extension->initRuntime($this->get('twig'));
 
-        return $this->createResponse($extension->renderField($field_element));
+        return new Response($extension->renderField($field_element));
     }
 
     public function getAdmin($code)
@@ -164,7 +166,7 @@ class CoreController extends Controller
         $extension = $twig->getExtension('sonata_base_application');
         $extension->initRuntime($this->get('twig'));
 
-        return $this->createResponse($extension->renderFormElement($fieldDescription, $form, $form->getData()));
+        return new Response($extension->renderFormElement($fieldDescription, $form, $form->getData()));
     }
 
     public function getShortObjectDescriptionAction($code = null, $objectId = null, $uniqid = null)
@@ -195,7 +197,7 @@ class CoreController extends Controller
 
         $description = sprintf('<a href="%s" target="new">%s</a>', $admin->generateUrl('edit', array('id' => $objectId)), $description);
 
-        return $this->createResponse($description);
+        return new Response($description);
     }
 
     public function dashboardAction()