2017-02-25 1547

allanmcarvalho · Feb 25, 2017 · d05d907 · d05d907
1 parent fde0da8
commit d05d907
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 0 deletions.
diff --git a/src/Validation/DefaultValidation.php b/src/Validation/DefaultValidation.php
@@ -41,5 +41,18 @@ protected static function checkTmpFile($check)
         }
         return true;
     }
+
+    /**
+     * Verify if file input is a file array
+     * @param array $check
+     * @throws Exception
+     */
+    protected static function checkInputType($check)
+    {
+        if (!is_array($check))
+        {
+            throw new Exception(__d('upload', "Misconfigured form"));
+        }
+    }
 
 }
diff --git a/src/Validation/ImageValidation.php b/src/Validation/ImageValidation.php
@@ -39,5 +39,18 @@ protected static function checkTmpFile($check)
         }
         return true;
     }
+
+    /**
+     * Verify if file input is a file array
+     * @param array $check
+     * @throws Exception
+     */
+    protected static function checkInputType($check)
+    {
+        if (!is_array($check))
+        {
+            throw new Exception(__d('upload', "Misconfigured form"));
+        }
+    }
 
 }
diff --git a/src/Validation/Traits/ImageTrait.php b/src/Validation/Traits/ImageTrait.php
@@ -57,6 +57,7 @@ protected static function greatestCommonDivisor($dividend_a, $dividend_b)
      */
     public static function isAboveMinWidth($check, $width)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -75,6 +76,7 @@ public static function isAboveMinWidth($check, $width)
      */
     public static function isBelowMaxWidth($check, $width)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -93,6 +95,7 @@ public static function isBelowMaxWidth($check, $width)
      */
     public static function isAboveMinHeight($check, $height)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -111,6 +114,7 @@ public static function isAboveMinHeight($check, $height)
      */
     public static function isBelowMaxHeight($check, $height)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -129,6 +133,7 @@ public static function isBelowMaxHeight($check, $height)
      */
     public static function isThisWidth($check, $width)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -147,6 +152,7 @@ public static function isThisWidth($check, $width)
      */
     public static function isThisHeight($check, $height)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -165,6 +171,7 @@ public static function isThisHeight($check, $height)
      */
     public static function isThisWidthAndHeight($check, $width, $height)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -189,6 +196,7 @@ public static function isThisWidthAndHeight($check, $width, $height)
      */
     public static function isThisAspectRatio($check, $width, $height)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -220,6 +228,7 @@ public static function isThisAspectRatio($check, $width, $height)
      */
     public static function isThisExtension($check, $extensions = [])
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;

diff --git a/src/Validation/Traits/UploadTrait.php b/src/Validation/Traits/UploadTrait.php
@@ -27,6 +27,7 @@ trait UploadTrait
      */
     public static function isUnderPhpSizeLimit($check)
     {
+        self::checkInputType();
         return Hash::get($check, 'error') !== UPLOAD_ERR_INI_SIZE;
     }
 
@@ -39,6 +40,7 @@ public static function isUnderPhpSizeLimit($check)
      */
     public static function isUnderFormSizeLimit($check)
     {
+        self::checkInputType();
         return Hash::get($check, 'error') !== UPLOAD_ERR_FORM_SIZE;
     }
 
@@ -50,6 +52,7 @@ public static function isUnderFormSizeLimit($check)
      */
     public static function isCompletedUpload($check)
     {
+        self::checkInputType();
         return Hash::get($check, 'error') !== UPLOAD_ERR_PARTIAL;
     }
 
@@ -61,6 +64,7 @@ public static function isCompletedUpload($check)
      */
     public static function isFileUpload($check)
     {
+        self::checkInputType();
         return Hash::get($check, 'error') !== UPLOAD_ERR_NO_FILE;
     }
 
@@ -72,6 +76,7 @@ public static function isFileUpload($check)
      */
     public static function isSuccessfulWrite($check)
     {
+        self::checkInputType();
         return Hash::get($check, 'error') !== UPLOAD_ERR_CANT_WRITE;
     }
 
@@ -84,6 +89,7 @@ public static function isSuccessfulWrite($check)
      */
     public static function isAboveMinSize($check, $size)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -100,6 +106,7 @@ public static function isAboveMinSize($check, $size)
      */
     public static function isBelowMaxSize($check, $size)
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;
@@ -115,6 +122,7 @@ public static function isBelowMaxSize($check, $size)
      */
     public static function isThisMimeType($check, $mimeTypes = [])
     {
+        self::checkInputType();
         if (!self::checkTmpFile($check))
         {
             return false;

diff --git a/src/Validation/UploadValidation.php b/src/Validation/UploadValidation.php
@@ -27,6 +27,10 @@ class UploadValidation
      */
     protected static function checkTmpFile($check)
     {
+        if (!is_array($check))
+        {
+            throw new Exception(__d('upload', "Misconfigured form"));
+        }
         if (isset($check['tmp_name']))
         {
             if (!is_file($check['tmp_name']))
@@ -40,4 +44,17 @@ protected static function checkTmpFile($check)
         return true;
     }
 
+    /**
+     * Verify if file input is a file array
+     * @param array $check
+     * @throws Exception
+     */
+    protected static function checkInputType($check)
+    {
+        if (!is_array($check))
+        {
+            throw new Exception(__d('upload', "Misconfigured form"));
+        }
+    }
+
 }