[Serializer] Fix DataUriNormalizer deprecation (MIME type guesser is optional)
This commit is contained in:
parent
3b90c98e04
commit
2740bd1a9d
@ -39,7 +39,7 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
|
|||||||
private $mimeTypeGuesser;
|
private $mimeTypeGuesser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param MimeTypeGuesserInterface
|
* @param MimeTypeGuesserInterface|null $mimeTypeGuesser
|
||||||
*/
|
*/
|
||||||
public function __construct($mimeTypeGuesser = null)
|
public function __construct($mimeTypeGuesser = null)
|
||||||
{
|
{
|
||||||
@ -48,8 +48,8 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
|
|||||||
} elseif (null === $mimeTypeGuesser) {
|
} elseif (null === $mimeTypeGuesser) {
|
||||||
if (class_exists(MimeTypes::class)) {
|
if (class_exists(MimeTypes::class)) {
|
||||||
$mimeTypeGuesser = MimeTypes::getDefault();
|
$mimeTypeGuesser = MimeTypes::getDefault();
|
||||||
} else {
|
} elseif (class_exists(MimeTypeGuesser::class)) {
|
||||||
@trigger_error(sprintf('Passing null to "%s()" without symfony/mime installed is deprecated since Symfony 4.3, install symfony/mime.', __METHOD__), E_USER_DEPRECATED);
|
@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);
|
||||||
$mimeTypeGuesser = MimeTypeGuesser::getInstance();
|
$mimeTypeGuesser = MimeTypeGuesser::getInstance();
|
||||||
}
|
}
|
||||||
} elseif (!$mimeTypeGuesser instanceof MimeTypes) {
|
} elseif (!$mimeTypeGuesser instanceof MimeTypes) {
|
||||||
@ -156,7 +156,9 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
|
|||||||
|
|
||||||
if ($this->mimeTypeGuesser instanceof DeprecatedMimeTypeGuesserInterface && $mimeType = $this->mimeTypeGuesser->guess($object->getPathname())) {
|
if ($this->mimeTypeGuesser instanceof DeprecatedMimeTypeGuesserInterface && $mimeType = $this->mimeTypeGuesser->guess($object->getPathname())) {
|
||||||
return $mimeType;
|
return $mimeType;
|
||||||
} elseif ($this->mimeTypeGuesser && $mimeType = $this->mimeTypeGuesser->guessMimeType($object->getPathname())) {
|
}
|
||||||
|
|
||||||
|
if ($this->mimeTypeGuesser && $mimeType = $this->mimeTypeGuesser->guessMimeType($object->getPathname())) {
|
||||||
return $mimeType;
|
return $mimeType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user