From 46f84d5eb9e7070d5fa3b9818fe86fa08b11d370 Mon Sep 17 00:00:00 2001
From: Giuliano Riccio <cosmo87rg@gmail.com>
Date: Fri, 19 Jul 2013 14:01:03 +0200
Subject: [PATCH 1/2] Zend\Validator\File\MimeType warning with no params

The following code will throw 3 warnings:

```php
$mimeTypeValidator = new \Zend\Validator\File\MimeType();
```
```
Warning: array_key_exists() expects parameter 2 to be array, null given in \library\Zend\Validator
\File\MimeType.php on line 116
Warning: array_keys() expects parameter 1 to be array, null given in \library\Zend\Validator\File\MimeType.php on line 123
Warning: Invalid argument supplied for foreach() in \library\Zend\Validator\File\MimeType.php on line 123
```
---
 library/Zend/Validator/File/MimeType.php | 48 ++++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/library/Zend/Validator/File/MimeType.php b/library/Zend/Validator/File/MimeType.php
index 240d426d5bd..9e8562c0170 100644
--- a/library/Zend/Validator/File/MimeType.php
+++ b/library/Zend/Validator/File/MimeType.php
@@ -101,31 +101,31 @@ public function __construct($options = null)
         } elseif (is_string($options)) {
             $this->setMimeType($options);
             $options = array();
-        }
-
-        if (isset($options['magicFile'])) {
-            $this->setMagicFile($options['magicFile']);
-            unset($options['magicFile']);
-        }
-
-        if (isset($options['enableHeaderCheck'])) {
-            $this->enableHeaderCheck($options['enableHeaderCheck']);
-            unset($options['enableHeaderCheck']);
-        }
-
-        if (array_key_exists('mimeType', $options)) {
-            $this->setMimeType($options['mimeType']);
-            unset($options['mimeType']);
-        }
-
-        // Handle cases where mimetypes are interspersed with options, or
-        // options are simply an array of mime types
-        foreach (array_keys($options) as $key) {
-            if (!is_int($key)) {
-                continue;
+        } elseif (is_array($options)) {
+            if (isset($options['magicFile'])) {
+                $this->setMagicFile($options['magicFile']);
+                unset($options['magicFile']);
+            }
+    
+            if (isset($options['enableHeaderCheck'])) {
+                $this->enableHeaderCheck($options['enableHeaderCheck']);
+                unset($options['enableHeaderCheck']);
+            }
+    
+            if (array_key_exists('mimeType', $options)) {
+                $this->setMimeType($options['mimeType']);
+                unset($options['mimeType']);
+            }
+    
+            // Handle cases where mimetypes are interspersed with options, or
+            // options are simply an array of mime types
+            foreach (array_keys($options) as $key) {
+                if (!is_int($key)) {
+                    continue;
+                }
+                $this->addMimeType($options[$key]);
+                unset($options[$key]);
             }
-            $this->addMimeType($options[$key]);
-            unset($options[$key]);
         }
 
         parent::__construct($options);

From 90f034c9661bc46190320e6bd10532910008551e Mon Sep 17 00:00:00 2001
From: Giuliano Riccio <cosmo87rg@gmail.com>
Date: Fri, 19 Jul 2013 14:07:25 +0200
Subject: [PATCH 2/2] removed trailing spaces

---
 library/Zend/Validator/File/MimeType.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Zend/Validator/File/MimeType.php b/library/Zend/Validator/File/MimeType.php
index 9e8562c0170..28a5a3471ee 100644
--- a/library/Zend/Validator/File/MimeType.php
+++ b/library/Zend/Validator/File/MimeType.php
@@ -106,17 +106,17 @@ public function __construct($options = null)
                 $this->setMagicFile($options['magicFile']);
                 unset($options['magicFile']);
             }
-    
+
             if (isset($options['enableHeaderCheck'])) {
                 $this->enableHeaderCheck($options['enableHeaderCheck']);
                 unset($options['enableHeaderCheck']);
             }
-    
+
             if (array_key_exists('mimeType', $options)) {
                 $this->setMimeType($options['mimeType']);
                 unset($options['mimeType']);
             }
-    
+
             // Handle cases where mimetypes are interspersed with options, or
             // options are simply an array of mime types
             foreach (array_keys($options) as $key) {