Make tests work with symfony2.4

Tests/Controller/CRUDControllerTest.php

@@ -25,6 +25,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 use Sonata\AdminBundle\Util\AdminObjectAclManipulator;
 use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 use Sonata\AdminBundle\Tests\Fixtures\Controller\BatchAdminController;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Test for CRUDController
@@ -162,12 +163,20 @@ class CRUDControllerTest extends \PHPUnit_Framework_TestCase
         $auditManager = $this->auditManager;
         $adminObjectAclManipulator = $this->adminObjectAclManipulator;
 
+        $requestStack = null;
+        if (Kernel::MINOR_VERSION > 3) {
+            $requestStack = new \Symfony\Component\HttpFoundation\RequestStack();
+            $requestStack->push($request);
+        }
+
         $this->container->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function($id) use ($pool, $request, $admin, $templating, $twig, $session, $exporter, $auditManager, $adminObjectAclManipulator) {
+            ->will($this->returnCallback(function($id) use ($pool, $request, $admin, $templating, $twig, $session, $exporter, $auditManager, $adminObjectAclManipulator, $requestStack) {
                     switch ($id) {
                         case 'sonata.admin.pool':
                             return $pool;
+                        case 'request_stack':
+                            return $requestStack;
                         case 'request':
                             return $request;
                         case 'foo.admin':

Tests/Controller/CoreControllerTest.php

@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Sonata\AdminBundle\Admin\Pool;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Kernel;
 
 class CoreControllerTest extends \PHPUnit_Framework_TestCase
 {
@@ -32,10 +33,17 @@ class CoreControllerTest extends \PHPUnit_Framework_TestCase
         $templating = $this->getMock('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface');
         $request = new Request();
 
+        $requestStack = null;
+        if (Kernel::MINOR_VERSION > 3) {
+            $requestStack = new \Symfony\Component\HttpFoundation\RequestStack();
+            $requestStack->push($request);
+        }
+
         $values = array(
             'sonata.admin.pool' => $pool,
             'templating'        => $templating,
-            'request'           => $request
+            'request'           => $request,
+            'request_stack'     => $requestStack
         );
 
         $container->expects($this->any())->method('get')->will($this->returnCallback(function($id) use ($values) {
@@ -64,10 +72,17 @@ class CoreControllerTest extends \PHPUnit_Framework_TestCase
         $request = new Request();
         $request->headers->set('X-Requested-With', 'XMLHttpRequest');
 
+        $requestStack = null;
+        if (Kernel::MINOR_VERSION > 3) {
+            $requestStack = new \Symfony\Component\HttpFoundation\RequestStack();
+            $requestStack->push($request);
+        }
+
         $values = array(
             'sonata.admin.pool' => $pool,
             'templating'        => $templating,
-            'request'           => $request
+            'request'           => $request,
+            'request_stack'     => $requestStack
         );
 
         $container->expects($this->any())->method('get')->will($this->returnCallback(function($id) use ($values) {