feature #43017 [HttpFoundation] Map multipart/form-data as form Content-Type (keichinger)

fabpot · fabpot · commit b641fdd0aefa · 2021-09-19T15:23:45.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [HttpFoundation] Map `multipart/form-data` as `form` Content-Type | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? |yes  | Deprecations? |no  | Tickets | #34240 | License | MIT | Doc PR | – As per RFC 2045 and RFC 2388 (see https://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.2), the `multipart/form-data` Content-Type should be used when submitting a mixed forms containing files, binary data and non-ASCII data. Currently, the same logic that would run in regular, non-mixed form scenarios can't run for mixed forms, as soon as it relies on the result of `Request::getContentType()` or anything else that might rely on `Request::$formats` without going low-level and avoiding the implemented abstraction. This PR fixes that. Resolves #34240 Commits ------- e597655 Map `multipart/form-data` as `form` Content-Type
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1988,7 +1988,7 @@ protected static function initializeFormats()
             'rdf' => ['application/rdf+xml'],
             'atom' => ['application/atom+xml'],
             'rss' => ['application/rss+xml'],
-            'form' => ['application/x-www-form-urlencoded'],
+            'form' => ['application/x-www-form-urlencoded', 'multipart/form-data'],
         ];
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -501,6 +501,7 @@ public function getFormatToMimeTypeMapProvider()
             ['xml', ['text/xml', 'application/xml', 'application/x-xml']],
             ['rdf', ['application/rdf+xml']],
             ['atom', ['application/atom+xml']],
+            ['form', ['application/x-www-form-urlencoded', 'multipart/form-data']],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1988,7 +1988,7 @@ protected static function initializeFormats()`
`1988`	`1988`	`'rdf' => ['application/rdf+xml'],`
`1989`	`1989`	`'atom' => ['application/atom+xml'],`
`1990`	`1990`	`'rss' => ['application/rss+xml'],`
`1991`		`- 'form' => ['application/x-www-form-urlencoded'],`
	`1991`	`+ 'form' => ['application/x-www-form-urlencoded', 'multipart/form-data'],`
`1992`	`1992`	`];`
`1993`	`1993`	`}`
`1994`	`1994`
Original file line number	Diff line number	Diff line change
`@@ -501,6 +501,7 @@ public function getFormatToMimeTypeMapProvider()`
`501`	`501`	`['xml', ['text/xml', 'application/xml', 'application/x-xml']],`
`502`	`502`	`['rdf', ['application/rdf+xml']],`
`503`	`503`	`['atom', ['application/atom+xml']],`
	`504`	`+ ['form', ['application/x-www-form-urlencoded', 'multipart/form-data']],`
`504`	`505`	`];`
`505`	`506`	`}`
`506`	`507`