瀏覽代碼

[HttpFoundation] added an exception to MimeTypeGuesser::guess() when no guesser are available (closes #2636)

Fabien Potencier 13 年之前
父節點
當前提交
d67fbe9e48
共有 1 個文件被更改,包括 5 次插入7 次删除
  1. 5 7
      src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php

+ 5 - 7
src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php

@@ -110,16 +110,14 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
             throw new AccessDeniedException($path);
         }
 
-        $mimeType = null;
+        if (!$this->guessers) {
+            throw new \LogicException('Unable to guess the mime type as no guesser are available.');
+        }
 
         foreach ($this->guessers as $guesser) {
-            $mimeType = $guesser->guess($path);
-
-            if (null !== $mimeType) {
-                break;
+            if (null !== $mimeType = $guesser->guess($path)) {
+                return $mimeType;
             }
         }
-
-        return $mimeType;
     }
 }