Doctrine

Timestamp:

10/15/08 20:45:35 (9 months ago)

Author:

jwage

Message:

[1.0, 1.1] fixes #1528 - issue with unsigned validator and float/string values

Location:

branches

Files:

• 1.0/lib/Doctrine/Validator/Unsigned.php (modified) (2 diffs)
• 1.1/lib/Doctrine/Validator/Unsigned.php (modified) (2 diffs)

branches/1.0/lib/Doctrine/Validator/Unsigned.php

@@ -34 +34 @@
 {
     /**
-     * checks if given value is a valid unsigned integer
+     * checks if given value is a valid unsigned integer or float
+     *
+     * valid values: null, '', 5, '5', 5.9, '5.9'
+     * invalid values: -5, '-5', 'five', -5.9, '-5.9', '5.5.5'
      *
      * @param mixed $value
@@ -41 +44 @@
     public function validate($value)
     {
-        $int = (int) $value;
+        if(is_null($value) || $value == '')
+        {
+            return true;
+        }
 
-        if ($int != $value || $int < 0) {
+        if (preg_match('/[^0-9\-\.]/', $value)) {
             return false;
         }
-        return true;
+
+        if(strpos($value, '.') === false)
+        {
+            $number = (int) $value;
+        } else {
+            $number = (float) $value;
+        }
+
+        if ((string) $number == $value && $number >= 0)
+        {
+            return true;
+        }
+
+        return false;
     }
 }

branches/1.1/lib/Doctrine/Validator/Unsigned.php

@@ -34 +34 @@
 {
     /**
-     * checks if given value is a valid unsigned integer
+     * checks if given value is a valid unsigned integer or float
+     *
+     * valid values: null, '', 5, '5', 5.9, '5.9'
+     * invalid values: -5, '-5', 'five', -5.9, '-5.9', '5.5.5'
      *
      * @param mixed $value
@@ -41 +44 @@
     public function validate($value)
     {
-        $int = (int) $value;
+        if(is_null($value) || $value == '')
+        {
+            return true;
+        }
 
-        if ($int != $value || $int < 0) {
+        if (preg_match('/[^0-9\-\.]/', $value)) {
             return false;
         }
-        return true;
+
+        if(strpos($value, '.') === false)
+        {
+            $number = (int) $value;
+        } else {
+            $number = (float) $value;
+        }
+
+        if ((string) $number == $value && $number >= 0)
+        {
+            return true;
+        }
+
+        return false;
     }
 }