[HttpFoundation] Accept must take the lead for Request::getPreferredFormat()

dunglas · fabpot · commit 60d997df75c6 · 2019-07-04T09:46:50.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1347,6 +1347,8 @@ public function setFormat($format, $mimeTypes)
      *  * _format request attribute
      *  * $default
      *
+     * @see getPreferredFormat
+     *
      * @param string|null $default The default format
      *
      * @return string|null The request format
@@ -1563,22 +1565,27 @@ public function isNoCache()
         return $this->headers->hasCacheControlDirective('no-cache') || 'no-cache' == $this->headers->get('Pragma');
     }
 
+    /**
+     * Gets the preferred format for the response by inspecting, in the following order:
+     *   * the request format set using setRequestFormat
+     *   * the values of the Accept HTTP header
+     *   * the content type of the body of the request.
+     */
     public function getPreferredFormat(?string $default = 'html'): ?string
     {
         if (null !== $this->preferredFormat) {
             return $this->preferredFormat;
         }
 
-        $this->preferredFormat = $this->getRequestFormat($this->getContentType());
-
-        if (null === $this->preferredFormat) {
-            foreach ($this->getAcceptableContentTypes() as $contentType) {
-                if (null !== $this->preferredFormat = $this->getFormat($contentType)) {
-                    break;
-                }
+        $preferredFormat = null;
+        foreach ($this->getAcceptableContentTypes() as $contentType) {
+            if ($preferredFormat = $this->getFormat($contentType)) {
+                break;
             }
         }
 
+        $this->preferredFormat = $this->getRequestFormat($preferredFormat ?: $this->getContentType());
+
         return $this->preferredFormat ?: $default;
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -407,14 +407,14 @@ public function testGetPreferredFormat()
         $this->assertSame('json', $request->getPreferredFormat('json'));
 
         $request->setRequestFormat('atom');
-        $request->headers->set('Content-Type', 'application/json');
-        $request->headers->set('Accept', 'application/xml');
+        $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('Content-Type', 'application/json');
         $request->headers->set('Accept', 'application/xml');
-        $this->assertSame('json', $request->getPreferredFormat());
+        $request->headers->set('Content-Type', 'application/json');
+        $this->assertSame('xml', $request->getPreferredFormat());
 
         $request = new Request();
         $request->headers->set('Accept', 'application/xml');
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -504,6 +504,7 @@ public function testPrepareSetContentType()
         $response = new Response('foo');
         $request = Request::create('/');
         $request->setRequestFormat('json');
+        $request->headers->remove('accept');
 
         $response->prepare($request);
 

Original file line number	Diff line number	Diff line change
`@@ -1347,6 +1347,8 @@ public function setFormat($format, $mimeTypes)`
`1347`	`1347`	`* * _format request attribute`
`1348`	`1348`	`* * $default`
`1349`	`1349`	`*`
	`1350`	`+ * @see getPreferredFormat`
	`1351`	`+ *`
`1350`	`1352`	`* @param string\|null $default The default format`
`1351`	`1353`	`*`
`1352`	`1354`	`* @return string\|null The request format`
`@@ -1563,22 +1565,27 @@ public function isNoCache()`
`1563`	`1565`	`return $this->headers->hasCacheControlDirective('no-cache') \|\| 'no-cache' == $this->headers->get('Pragma');`
`1564`	`1566`	`}`
`1565`	`1567`
	`1568`	`+ /**`
	`1569`	`+ * Gets the preferred format for the response by inspecting, in the following order:`
	`1570`	`+ * * the request format set using setRequestFormat`
	`1571`	`+ * * the values of the Accept HTTP header`
	`1572`	`+ * * the content type of the body of the request.`
	`1573`	`+ */`
`1566`	`1574`	`public function getPreferredFormat(?string $default = 'html'): ?string`
`1567`	`1575`	`{`
`1568`	`1576`	`if (null !== $this->preferredFormat) {`
`1569`	`1577`	`return $this->preferredFormat;`
`1570`	`1578`	`}`
`1571`	`1579`
`1572`		`- $this->preferredFormat = $this->getRequestFormat($this->getContentType());`
`1573`		`-`
`1574`		`- if (null === $this->preferredFormat) {`
`1575`		`- foreach ($this->getAcceptableContentTypes() as $contentType) {`
`1576`		`- if (null !== $this->preferredFormat = $this->getFormat($contentType)) {`
`1577`		`- break;`
`1578`		`- }`
	`1580`	`+ $preferredFormat = null;`
	`1581`	`+ foreach ($this->getAcceptableContentTypes() as $contentType) {`
	`1582`	`+ if ($preferredFormat = $this->getFormat($contentType)) {`
	`1583`	`+ break;`
`1579`	`1584`	`}`
`1580`	`1585`	`}`
`1581`	`1586`
	`1587`	`+ $this->preferredFormat = $this->getRequestFormat($preferredFormat ?: $this->getContentType());`
	`1588`	`+`
`1582`	`1589`	`return $this->preferredFormat ?: $default;`
`1583`	`1590`	`}`
`1584`	`1591`