simplify constant usage. FILEINFO_MIME_TYPE is available since PHP 5.3.0

sasezaki · Mar 23, 2013 · 5045219 · 5045219
1 parent e00aefc
commit 5045219
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
@@ -1224,10 +1224,9 @@ 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();
             }
 

diff --git a/library/Zend/Validator/File/ExcludeMimeType.php b/library/Zend/Validator/File/ExcludeMimeType.php
@@ -61,9 +61,8 @@ public function isValid($value, $file = null)
 
         $mimefile = $this->getMagicFile();
         if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
             if (!$this->isMagicFileDisabled() && (!empty($mimefile) && empty($this->finfo))) {
-                $this->finfo = finfo_open($const, $mimefile);
+                $this->finfo = finfo_open(FILEINFO_MIME_TYPE, $mimefile);
             }
 
             if (empty($this->finfo)) {

diff --git a/library/Zend/Validator/File/MimeType.php b/library/Zend/Validator/File/MimeType.php
@@ -201,9 +201,8 @@ public function setMagicFile($file)
                 $file
             ));
         } else {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
             ErrorHandler::start(E_NOTICE|E_WARNING);
-            $this->finfo = finfo_open($const, $file);
+            $this->finfo = finfo_open(FILEINFO_MIME_TYPE, $file);
             $error       = ErrorHandler::stop();
             if (empty($this->finfo)) {
                 $this->finfo = null;
@@ -376,10 +375,9 @@ public function isValid($value, $file = null)
 
         $mimefile = $this->getMagicFile();
         if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
             if (!$this->isMagicFileDisabled() && (!empty($mimefile) && empty($this->finfo))) {
                 ErrorHandler::start(E_NOTICE|E_WARNING);
-                $this->finfo = finfo_open($const, $mimefile);
+                $this->finfo = finfo_open(FILEINFO_MIME_TYPE, $mimefile);
                 ErrorHandler::stop();
             }