Merge branch 'feature/55' into develop

Close #55

Author: weierophinney

CHANGELOG.md

@@ -15,7 +15,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#55](https://github.com/zendframework/zend-validator/pull/55) removes some
+  checks for `safe_mode` within the `MimeType` validator, as `safe_mode` became
+  obsolete starting with PHP 5.4.
 
 ### Fixed
 

src/File/MimeType.php

@@ -148,21 +148,16 @@ public function getMagicFile()
                 return $this->options['magicFile'];
             }
 
-            ErrorHandler::start();
-            $safeMode = ini_get('safe_mode');
-            ErrorHandler::stop();
-
-            if (!($safeMode == 'On' || $safeMode === 1)) {
-                foreach ($this->magicFiles as $file) {
-                    // suppressing errors which are thrown due to openbase_dir restrictions
-                    try {
-                        $this->setMagicFile($file);
-                        if ($this->options['magicFile'] !== null) {
-                            break;
-                        }
-                    } catch (Exception\ExceptionInterface $e) {
-                        // Intentionally, catch and fall through
-                    }
+            foreach ($this->magicFiles as $file) {
+                try {
+                    $this->setMagicFile($file);
+                } catch (Exception\ExceptionInterface $e) {
+                    // suppressing errors which are thrown due to open_basedir restrictions
+                    continue;
+                }
+
+                if ($this->options['magicFile'] !== null) {
+                    return $this->options['magicFile'];
                 }
             }