From d67fbe9e48b90c29c7e0d3ce19e5d1ef643ace7a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 14 Nov 2011 13:21:49 +0100 Subject: [PATCH] [HttpFoundation] added an exception to MimeTypeGuesser::guess() when no guesser are available (closes #2636) --- .../File/MimeType/MimeTypeGuesser.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php index 23dd46324d..8802102063 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php @@ -110,16 +110,14 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface throw new AccessDeniedException($path); } - $mimeType = null; - - foreach ($this->guessers as $guesser) { - $mimeType = $guesser->guess($path); - - if (null !== $mimeType) { - break; - } + if (!$this->guessers) { + throw new \LogicException('Unable to guess the mime type as no guesser are available.'); } - return $mimeType; + foreach ($this->guessers as $guesser) { + if (null !== $mimeType = $guesser->guess($path)) { + return $mimeType; + } + } } }