minor #2069 backport fixes from master (xabbuh)

This PR was squashed before being merged into the 2.x branch (closes #2069). Discussion ---------- backport fixes from master #2066, #2067, and #2068 should have actually been merged into `2.x` Commits ------- e314eec ensure kernel is shut down after each test 98c1c32 prevent exceptions caused by missing formats 1c8d9e0 allow JMS Serializer 3 in tests
FriendsOfSymfony · Jan 31, 2020 · 3a5c187 · 3a5c187
2 parents 30a544b + e314eec
commit 3a5c187
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/Tests/Functional/ConfigurationTest.php b/Tests/Functional/ConfigurationTest.php
@@ -40,9 +40,10 @@ public function testToolbar()
                 '/_profiler/empty/search/results?limit=10',
                 [],
                 [],
-                ['HTTP_Accept' => 'application/json']
+                ['HTTP_Accept' => 'application/xml']
             );
 
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
         $this->assertSame('text/html; charset=UTF-8', $client->getResponse()->headers->get('Content-Type'));
     }
 }
diff --git a/Tests/Functional/ExceptionListenerTest.php b/Tests/Functional/ExceptionListenerTest.php
@@ -30,11 +30,6 @@ public static function tearDownAfterClass()
         parent::tearDownAfterClass();
     }
 
-    protected function tearDown(): void
-    {
-        // prevent kernel shutdown
-    }
-
     public function testBundleListenerHandlesExceptionsInRestZones()
     {
         static::$client->request('GET', '/api/test');

diff --git a/Tests/Functional/RoutingTest.php b/Tests/Functional/RoutingTest.php
@@ -27,11 +27,6 @@ public static function tearDownAfterClass()
         parent::tearDownAfterClass();
     }
 
-    protected function tearDown(): void
-    {
-        // prevent kernel shutdown
-    }
-
     public function testPostControllerRoutesAreRegistered()
     {
         static::$client->request('GET', '/posts/1');

diff --git a/Tests/Functional/VersionTest.php b/Tests/Functional/VersionTest.php
@@ -30,11 +30,6 @@ public static function tearDownAfterClass()
         parent::tearDownAfterClass();
     }
 
-    protected function tearDown(): void
-    {
-        // prevent kernel shutdown
-    }
-
     public function testVersionAnnotation()
     {
         static::$client->request(

diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
         "symfony/templating": "^3.4|^4.3",
         "phpoption/phpoption": "^1.1",
         "jms/serializer-bundle": "^2.3.1|^3.0",
-        "jms/serializer": "^1.13|^2.0",
+        "jms/serializer": "^1.13|^2.0|^3.0",
         "psr/http-message": "^1.0",
         "friendsofphp/php-cs-fixer": "^2.0"
     },