Merge pull request #1895 from FriendsOfSymfony/tests

Fix the tests

Author: GuilhemN

Tests/Functional/ParamFetcherTest.php

@@ -12,6 +12,7 @@
 namespace FOS\RestBundle\Tests\Functional;
 
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
  * @author Ener-Getick <[email protected]>
@@ -169,13 +170,18 @@ public function testValidQueryParameter()
         $this->client->request('POST', '/params?foz=val1');
     }
 
-    /**
-     * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
-     * @expectedExceptionMessage 'baz' param is incompatible with foz param.
-     */
     public function testIncompatibleQueryParameter()
     {
-        $this->client->request('POST', '/params?foz=val1&baz=val2');
+        try {
+            $this->client->request('POST', '/params?foz=val1&baz=val2');
+
+            // SF >= 3.0
+            $this->assertEquals(400, $this->client->getResponse()->getStatusCode());
+            $this->assertContains("'baz' param is incompatible with foz param.", $this->client->getResponse()->getContent());
+        } catch (BadRequestHttpException $e) {
+            // SF 2.x
+            $this->assertEquals("'baz' param is incompatible with foz param.", $e->getMessage());
+        }
     }
 
     protected function getData()

composer.json

@@ -47,7 +47,7 @@
     },
     "require-dev": {
         "sensio/framework-extra-bundle": "^3.0.13|^4.0|^5.0",
-        "symfony/phpunit-bridge": "^3.2|^4.0",
+        "symfony/phpunit-bridge": "^4.0",
         "symfony/asset": "^2.7|^3.0|^4.0",
         "symfony/form": "^2.7|^3.0|^4.0",
         "symfony/validator": "^2.7|^3.0|^4.0",
@@ -57,7 +57,7 @@
         "symfony/web-profiler-bundle": "^2.7|^3.0|^4.0",
         "symfony/twig-bundle": "^2.7|^3.0|^4.0",
         "symfony/browser-kit": "^2.7|^3.0|^4.0",
-        "symfony/dependency-injection": "^2.7|^3.0|^4.0",
+        "symfony/dependency-injection": "^2.7.20|^3.0|^4.0",
         "symfony/expression-language": "~2.7|^3.0|^4.0",
         "symfony/css-selector": "^2.7|^3.0|^4.0",
         "phpoption/phpoption": "^1.1",