Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport fixes from master #2069

Merged
merged 3 commits into from Jan 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Tests/Functional/ConfigurationTest.php
Expand Up @@ -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'));
}
}
5 changes: 0 additions & 5 deletions Tests/Functional/ExceptionListenerTest.php
Expand Up @@ -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');
Expand Down
5 changes: 0 additions & 5 deletions Tests/Functional/RoutingTest.php
Expand Up @@ -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');
Expand Down
5 changes: 0 additions & 5 deletions Tests/Functional/VersionTest.php
Expand Up @@ -30,11 +30,6 @@ public static function tearDownAfterClass()
parent::tearDownAfterClass();
}

protected function tearDown(): void
{
// prevent kernel shutdown
}

public function testVersionAnnotation()
{
static::$client->request(
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -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"
},
Expand Down