Changeset 1463

Timestamp:

01/07/07 04:00:26 (2 years ago)

Author:

dominik

Message:

add in_locale, no_locale and cast_to parameters to the number validator

refs #359

Files:

• branches/0.11/src/validator/AgaviNumberValidator.class.php (modified) (3 diffs)

branches/0.11/src/validator/AgaviNumberValidator.class.php

@@ -47 +47 @@
   protected function validate()
   {
-    $value = $this->getData($this->getArgument());
+    $value =& $this->getData($this->getArgument());
+
+    $hasExtraChars = false;
+
+    if(!$this->getParameter('no_locale', false)) {
+      if($locale = $this->getParameter('in_locale')) {
+        $locale = $this->getContext()->getTranslationManager()->getLocaleFromIdentifier($locale);
+      } else {
+        $locale = $this->getContext()->getTranslationManager()->getCurrentLocale();
+      }
+
+      $value = AgaviDecimalFormatter::parse($value, $locale, $hasExtraChars);
+    }
 
     switch(strtolower($this->getParameter('type'))) {
       case 'int':
       case 'integer':
-        $temp = (int) $value;
-        if(((string)$temp) !== ((string)$value) ) {
+        if(!is_int($value) || $hasExtraChars) {
           $this->throwError('type');
           return false;
@@ -61 +72 @@
       
       case 'float':
-        if(!is_numeric($value)) {
+        if(!is_float($value) || $hasExtraChars) {
           $this->throwError('type');
           return false;
@@ -67 +78 @@
         
         break;
+    }
+
+    switch(strtolower($this->getParameter('cast_to'))) {
+      case 'int':
+      case 'integer':
+        $value = (int) $value;
+        break;
+
+      case 'float':
+      case 'double':
+        $value = (float) $value;
+        break;
+
     }