Removed request header "Content-Type" from the preferred format guessing mechanism
This commit is contained in:
parent
4c50968dd8
commit
776523e56a
@ -1586,20 +1586,17 @@ class Request
|
||||
*/
|
||||
public function getPreferredFormat(?string $default = 'html'): ?string
|
||||
{
|
||||
if (null !== $this->preferredFormat) {
|
||||
if (null !== $this->preferredFormat || null !== $this->preferredFormat = $this->getRequestFormat(null)) {
|
||||
return $this->preferredFormat;
|
||||
}
|
||||
|
||||
$preferredFormat = null;
|
||||
foreach ($this->getAcceptableContentTypes() as $contentType) {
|
||||
if ($preferredFormat = $this->getFormat($contentType)) {
|
||||
break;
|
||||
foreach ($this->getAcceptableContentTypes() as $mimeType) {
|
||||
if ($this->preferredFormat = $this->getFormat($mimeType)) {
|
||||
return $this->preferredFormat;
|
||||
}
|
||||
}
|
||||
|
||||
$this->preferredFormat = $this->getRequestFormat($preferredFormat ?: $this->getContentType());
|
||||
|
||||
return $this->preferredFormat ?: $default;
|
||||
return $default;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -408,12 +408,10 @@ class RequestTest extends TestCase
|
||||
|
||||
$request->setRequestFormat('atom');
|
||||
$request->headers->set('Accept', 'application/ld+json');
|
||||
$request->headers->set('Content-Type', 'application/merge-patch+json');
|
||||
$this->assertSame('atom', $request->getPreferredFormat());
|
||||
|
||||
$request = new Request();
|
||||
$request->headers->set('Accept', 'application/xml');
|
||||
$request->headers->set('Content-Type', 'application/json');
|
||||
$this->assertSame('xml', $request->getPreferredFormat());
|
||||
|
||||
$request = new Request();
|
||||
|
Reference in New Issue
Block a user