Commit3816617

authored and

committed

[HttpFoundation] Don’t check suffix on empty MIME type

1 parentd46df40 commit3816617Copy full SHA for 3816617

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1259,8 +1259,8 @@ public function getFormat(?string $mimeType, bool $subtypeFallback = false): ?st`
`1259`	`1259`	`}`
`1260`	`1260`	`}`
`1261`	`1261`
`1262`		`-if (!$canonicalMimeType) {`
`1263`		`-$canonicalMimeType =$mimeType;`
	`1262`	`+if (!$canonicalMimeType ??=$mimeType) {`
	`1263`	`+returnnull;`
`1264`	`1264`	`}`
`1265`	`1265`
`1266`	`1266`	`if (str_starts_with($canonicalMimeType,'application/') &&str_contains($canonicalMimeType,'+')) {`
`@@ -1964,8 +1964,6 @@ protected static function initializeFormats(): void`
`1964`	`1964`	`}`
`1965`	`1965`
`1966`	`1966`	`/**`
`1967`		`- * Structured MIME suffix fallback formats`
`1968`		`- *`
`1969`	`1967`	`* This mapping is used when no exact MIME match is found in $formats.`
`1970`	`1968`	`* It enables handling of types like application/soap+xml → 'xml'.`
`1971`	`1969`	`*`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -538,9 +538,7 @@ public static function getFormatToMimeTypeMapProvider()`
`538`	`538`	`];`
`539`	`539`	`}`
`540`	`540`
`541`		`-/**`
`542`		`- * @dataProvider getFormatWithSubtypeFallbackProvider`
`543`		`- */`
	`541`	`+ #[DataProvider('getFormatWithSubtypeFallbackProvider')]`
`544`	`542`	`publicfunctiontestGetFormatFromMimeTypeWithSubtypeFallback($expectedFormat,$mimeTypes)`
`545`	`543`	`{`
`546`	`544`	`$request =newRequest();`

Comments

(0)