Merge pull request zendframework/zendframework#4102 from sasezaki/val…

…idator_fileinfo_simplify_constants simplify constant usage. FILEINFO_MIME_TYPE is available since PHP 5.3.0
zendframework · Mar 28, 2013 · dbb3bb5 · dbb3bb5
commit dbb3bb5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Transfer/Adapter/AbstractAdapter.php b/src/Transfer/Adapter/AbstractAdapter.php
@@ -1224,16 +1224,15 @@ protected function detectMimeType($value)
         }
 
         if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
             if (!empty($value['options']['magicFile'])) {
                 ErrorHandler::start();
-                $mime = finfo_open($const, $value['options']['magicFile']);
+                $mime = finfo_open(FILEINFO_MIME_TYPE, $value['options']['magicFile']);
                 ErrorHandler::stop();
             }
 
             if (empty($mime)) {
                 ErrorHandler::start();
-                $mime = finfo_open($const);
+                $mime = finfo_open(FILEINFO_MIME_TYPE);
                 ErrorHandler::stop();
             }