projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the Search API Synonym module to deal specifically with licence and license...
[yaffs-website]
/
vendor
/
symfony
/
http-foundation
/
File
/
MimeType
/
MimeTypeGuesser.php
diff --git
a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
index 69c803b4993bc5821cbb86a87f9dc1b6fd209730..dae47a7c023d74ad28bceb9a18afdd4daa9e5e9f 100644
(file)
--- a/
vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
+++ b/
vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
@@
-11,8
+11,8
@@
namespace Symfony\Component\HttpFoundation\File\MimeType;
namespace Symfony\Component\HttpFoundation\File\MimeType;
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
/**
* A singleton mime type guesser.
/**
* A singleton mime type guesser.
@@
-80,21
+80,14
@@
class MimeTypeGuesser implements MimeTypeGuesserInterface
*/
private function __construct()
{
*/
private function __construct()
{
- if (FileBinaryMimeTypeGuesser::isSupported()) {
- $this->register(new FileBinaryMimeTypeGuesser());
- }
-
- if (FileinfoMimeTypeGuesser::isSupported()) {
- $this->register(new FileinfoMimeTypeGuesser());
- }
+ $this->register(new FileBinaryMimeTypeGuesser());
+ $this->register(new FileinfoMimeTypeGuesser());
}
/**
* Registers a new mime type guesser.
*
* When guessing, this guesser is preferred over previously registered ones.
}
/**
* Registers a new mime type guesser.
*
* When guessing, this guesser is preferred over previously registered ones.
- *
- * @param MimeTypeGuesserInterface $guesser
*/
public function register(MimeTypeGuesserInterface $guesser)
{
*/
public function register(MimeTypeGuesserInterface $guesser)
{
@@
-127,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) {
if (null !== $mimeType = $guesser->guess($path)) {
return $mimeType;
}
}
foreach ($this->guessers as $guesser) {
if (null !== $mimeType = $guesser->guess($path)) {
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?)');
+ }
}
}
}
}