diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index bb5409123053b..6690b9b22165b 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1586,20 +1586,17 @@ public function isNoCache()
*/
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;
}
/**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 1d016472515db..7c53ec2d53655 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -408,12 +408,10 @@ public function testGetPreferredFormat()
$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();
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy