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 ca6cc78

Browse filesBrowse files
committed
Merge branch '2.7' into 2.8
* 2.7: [HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
2 parents 2ed0ced + ab32125 commit ca6cc78
Copy full SHA for ca6cc78

File tree

Expand file treeCollapse file tree

1 file changed

+6
-15
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-15
lines changed

‎src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
+6-15Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,8 @@ public static function reset()
8080
*/
8181
private function __construct()
8282
{
83-
if (FileBinaryMimeTypeGuesser::isSupported()) {
84-
$this->register(new FileBinaryMimeTypeGuesser());
85-
}
86-
87-
if (FileinfoMimeTypeGuesser::isSupported()) {
88-
$this->register(new FileinfoMimeTypeGuesser());
89-
}
83+
$this->register(new FileBinaryMimeTypeGuesser());
84+
$this->register(new FileinfoMimeTypeGuesser());
9085
}
9186

9287
/**
@@ -125,18 +120,14 @@ public function guess($path)
125120
throw new AccessDeniedException($path);
126121
}
127122

128-
if (!$this->guessers) {
129-
$msg = 'Unable to guess the mime type as no guessers are available';
130-
if (!FileinfoMimeTypeGuesser::isSupported()) {
131-
$msg .= ' (Did you enable the php_fileinfo extension?)';
132-
}
133-
throw new \LogicException($msg);
134-
}
135-
136123
foreach ($this->guessers as $guesser) {
137124
if (null !== $mimeType = $guesser->guess($path)) {
138125
return $mimeType;
139126
}
140127
}
128+
129+
if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) {
130+
throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)');
131+
}
141132
}
142133
}

0 commit comments

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