MAGETWO-89875: null passed to count() call in Zend/Validate/File/Uplo…

…ad.php
magento · Mar 30, 2018 · 34a90a1 · 34a90a1
1 parent d99ca64
commit 34a90a1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/library/Zend/Validate/File/FilesSize.php b/library/Zend/Validate/File/FilesSize.php
@@ -155,10 +155,6 @@ public function isValid($value, $file = null)
             }
         }
 
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
+        return !empty($this->_messages);
     }
 }
diff --git a/library/Zend/Validate/File/ImageSize.php b/library/Zend/Validate/File/ImageSize.php
@@ -338,11 +338,7 @@ public function isValid($value, $file = null)
             $this->_throw($file, self::HEIGHT_TOO_BIG);
         }
 
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
+        return !empty($this->_messages);
     }
 
     /**

diff --git a/library/Zend/Validate/File/Size.php b/library/Zend/Validate/File/Size.php
@@ -312,11 +312,7 @@ public function isValid($value, $file = null)
             }
         }
 
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
+        return !empty($this->_messages);
     }
 
     /**

diff --git a/library/Zend/Validate/File/Upload.php b/library/Zend/Validate/File/Upload.php
@@ -161,7 +161,7 @@ public function setFiles($files = array())
      */
     public function isValid($value, $file = null)
     {
-        $this->_messages = null;
+        $this->_messages = [];
         if (array_key_exists($value, $this->_files)) {
             $files[$value] = $this->_files[$value];
         } else {
@@ -223,11 +223,7 @@ public function isValid($value, $file = null)
             }
         }
 
-        if (count($this->_messages) > 0) {
-            return false;
-        } else {
-            return true;
-        }
+        return !empty($this->_messages);
     }
 
     /**