Skip to content

Commit 3a5c187

Browse files
committed
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
2 parents 30a544b + e314eec commit 3a5c187

File tree

5 files changed

+3
-17
lines changed

5 files changed

+3
-17
lines changed

Tests/Functional/ConfigurationTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ public function testToolbar()
4040
'/_profiler/empty/search/results?limit=10',
4141
[],
4242
[],
43-
['HTTP_Accept' => 'application/json']
43+
['HTTP_Accept' => 'application/xml']
4444
);
4545

46+
$this->assertSame(200, $client->getResponse()->getStatusCode());
4647
$this->assertSame('text/html; charset=UTF-8', $client->getResponse()->headers->get('Content-Type'));
4748
}
4849
}

Tests/Functional/ExceptionListenerTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public static function tearDownAfterClass()
3030
parent::tearDownAfterClass();
3131
}
3232

33-
protected function tearDown(): void
34-
{
35-
// prevent kernel shutdown
36-
}
37-
3833
public function testBundleListenerHandlesExceptionsInRestZones()
3934
{
4035
static::$client->request('GET', '/api/test');

Tests/Functional/RoutingTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ public static function tearDownAfterClass()
2727
parent::tearDownAfterClass();
2828
}
2929

30-
protected function tearDown(): void
31-
{
32-
// prevent kernel shutdown
33-
}
34-
3530
public function testPostControllerRoutesAreRegistered()
3631
{
3732
static::$client->request('GET', '/posts/1');

Tests/Functional/VersionTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public static function tearDownAfterClass()
3030
parent::tearDownAfterClass();
3131
}
3232

33-
protected function tearDown(): void
34-
{
35-
// prevent kernel shutdown
36-
}
37-
3833
public function testVersionAnnotation()
3934
{
4035
static::$client->request(

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"symfony/templating": "^3.4|^4.3",
6262
"phpoption/phpoption": "^1.1",
6363
"jms/serializer-bundle": "^2.3.1|^3.0",
64-
"jms/serializer": "^1.13|^2.0",
64+
"jms/serializer": "^1.13|^2.0|^3.0",
6565
"psr/http-message": "^1.0",
6666
"friendsofphp/php-cs-fixer": "^2.0"
6767
},

0 commit comments

Comments
 (0)