Skip to content

Commit 4ee1404

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Serializer] cs fix Cleanup more `@return` annotations [Form] Fix phpdoc on FormBuilderInterface
2 parents 58c9adb + b0b9afe commit 4ee1404

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

MimeTypeGuesserInterface.php

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ public function isGuesserSupported(): bool;
2626
/**
2727
* Guesses the MIME type of the file with the given path.
2828
*
29-
* @return string|null The MIME type or null, if none could be guessed
30-
*
3129
* @throws \LogicException If the guesser is not supported
3230
* @throws \InvalidArgumentException If the file does not exist or is not readable
3331
*/

MimeTypesInterface.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
interface MimeTypesInterface extends MimeTypeGuesserInterface
1818
{
1919
/**
20-
* Gets the extensions for the given MIME type.
20+
* Gets the extensions for the given MIME type in decreasing order of preference.
2121
*
22-
* @return string[] an array of extensions (first one is the preferred one)
22+
* @return string[]
2323
*/
2424
public function getExtensions(string $mimeType): array;
2525

2626
/**
27-
* Gets the MIME types for the given extension.
27+
* Gets the MIME types for the given extension in decreasing order of preference.
2828
*
29-
* @return string[] an array of MIME types (first one is the preferred one)
29+
* @return string[]
3030
*/
3131
public function getMimeTypes(string $ext): array;
3232
}

0 commit comments

Comments
 (0)