Merge branch '2.8' into 3.4
* 2.8: [HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
This commit is contained in:
commit
993c028185
@ -46,7 +46,7 @@
|
|||||||
"twig/twig": "~1.34|~2.4"
|
"twig/twig": "~1.34|~2.4"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/security": "4.1.0-beta1,4.1.0-beta2",
|
"symfony/security": "4.1.0-beta1|4.1.0-beta2",
|
||||||
"symfony/var-dumper": "<3.3",
|
"symfony/var-dumper": "<3.3",
|
||||||
"symfony/event-dispatcher": "<3.4",
|
"symfony/event-dispatcher": "<3.4",
|
||||||
"symfony/framework-bundle": "<3.4",
|
"symfony/framework-bundle": "<3.4",
|
||||||
|
@ -80,13 +80,8 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
|
|||||||
*/
|
*/
|
||||||
private function __construct()
|
private function __construct()
|
||||||
{
|
{
|
||||||
if (FileBinaryMimeTypeGuesser::isSupported()) {
|
$this->register(new FileBinaryMimeTypeGuesser());
|
||||||
$this->register(new FileBinaryMimeTypeGuesser());
|
$this->register(new FileinfoMimeTypeGuesser());
|
||||||
}
|
|
||||||
|
|
||||||
if (FileinfoMimeTypeGuesser::isSupported()) {
|
|
||||||
$this->register(new FileinfoMimeTypeGuesser());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -125,18 +120,14 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
|
|||||||
throw new AccessDeniedException($path);
|
throw new AccessDeniedException($path);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->guessers) {
|
|
||||||
$msg = 'Unable to guess the mime type as no guessers are available';
|
|
||||||
if (!FileinfoMimeTypeGuesser::isSupported()) {
|
|
||||||
$msg .= ' (Did you enable the php_fileinfo extension?)';
|
|
||||||
}
|
|
||||||
throw new \LogicException($msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($this->guessers as $guesser) {
|
foreach ($this->guessers as $guesser) {
|
||||||
if (null !== $mimeType = $guesser->guess($path)) {
|
if (null !== $mimeType = $guesser->guess($path)) {
|
||||||
return $mimeType;
|
return $mimeType;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) {
|
||||||
|
throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user