Skip to content

Commit d93193b

Browse files
committed
Merge 3.4
2 parents e5b3c99 + 8668de0 commit d93193b

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

src/State/Provider/ContentNegotiationProvider.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
6262
private function addRequestFormats(Request $request, array $formats): void
6363
{
6464
foreach ($formats as $format => $mimeTypes) {
65-
$existingMimeTypes = $request->getMimeTypes($format);
66-
$newMimeTypes = array_unique(array_merge((array) $mimeTypes, $existingMimeTypes));
67-
$request->setFormat($format, $newMimeTypes);
65+
$request->setFormat($format, (array) $mimeTypes);
6866
}
6967
}
7068

tests/State/Provider/ContentNegotiationProviderTest.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,6 @@ class ContentNegotiationProviderTest extends TestCase
2727
{
2828
use ProphecyTrait;
2929

30-
public function testAddRequestFormatsAddsMimeTypesToFormat(): void
31-
{
32-
$provider = new ContentNegotiationProvider();
33-
$request = new Request();
34-
$formats = ['json' => ['application/problem+json']];
35-
36-
$operation = new Post(outputFormats: $formats);
37-
$context = ['request' => $request];
38-
39-
$provider->provide($operation, [], $context);
40-
41-
$mimeTypes = $request->getMimeTypes('json');
42-
43-
$this->assertContains('application/problem+json', $mimeTypes);
44-
$this->assertContains('application/json', $mimeTypes);
45-
}
46-
4730
public function testRequestWithEmptyContentType(): void
4831
{
4932
$expectedResult = new \stdClass();

0 commit comments

Comments
 (0)