Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2740bd1

Browse filesBrowse files
ogizanaginicolas-grekas
authored andcommitted
[Serializer] Fix DataUriNormalizer deprecation (MIME type guesser is optional)
1 parent 3b90c98 commit 2740bd1
Copy full SHA for 2740bd1

File tree

1 file changed

+6
-4
lines changed
Filter options

1 file changed

+6
-4
lines changed

‎src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+6-4Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
3939
private $mimeTypeGuesser;
4040

4141
/**
42-
* @param MimeTypeGuesserInterface
42+
* @param MimeTypeGuesserInterface|null $mimeTypeGuesser
4343
*/
4444
public function __construct($mimeTypeGuesser = null)
4545
{
@@ -48,8 +48,8 @@ public function __construct($mimeTypeGuesser = null)
4848
} elseif (null === $mimeTypeGuesser) {
4949
if (class_exists(MimeTypes::class)) {
5050
$mimeTypeGuesser = MimeTypes::getDefault();
51-
} else {
52-
@trigger_error(sprintf('Passing null to "%s()" without symfony/mime installed is deprecated since Symfony 4.3, install symfony/mime.', __METHOD__), E_USER_DEPRECATED);
51+
} elseif (class_exists(MimeTypeGuesser::class)) {
52+
@trigger_error(sprintf('Passing null to "%s()" to use a default MIME type guesser without Symfony Mime installed is deprecated since Symfony 4.3. Try running "composer require symfony/mime".', __METHOD__), E_USER_DEPRECATED);
5353
$mimeTypeGuesser = MimeTypeGuesser::getInstance();
5454
}
5555
} elseif (!$mimeTypeGuesser instanceof MimeTypes) {
@@ -156,7 +156,9 @@ private function getMimeType(\SplFileInfo $object)
156156

157157
if ($this->mimeTypeGuesser instanceof DeprecatedMimeTypeGuesserInterface && $mimeType = $this->mimeTypeGuesser->guess($object->getPathname())) {
158158
return $mimeType;
159-
} elseif ($this->mimeTypeGuesser && $mimeType = $this->mimeTypeGuesser->guessMimeType($object->getPathname())) {
159+
}
160+
161+
if ($this->mimeTypeGuesser && $mimeType = $this->mimeTypeGuesser->guessMimeType($object->getPathname())) {
160162
return $mimeType;
161163
}
162164

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.