Fix required

ValidatorBundle/Validator.php

@@ -174,7 +174,7 @@ class Validator
     public function get($field, $default = null)
     {
         $value = isset($this->values[$field]) ? trim($this->values[$field]) : $default;
-        if (empty($value)) $value = $default;
+        if (strlen($value) == 0) $value = $default;
         return $value;
     }
 
@@ -273,7 +273,9 @@ class Validator
     {
         foreach ($this->rules as $field => $rules)
         {
-            foreach ($rules as $rule) $this->test($field, $rule);
+          	$rules_names = array_map(function($rule) { return $rule['rule']; }, $rules);
+            $nullable = !in_array('required', $rules_names) && !in_array('required_file', $rules_names) && !in_array('required_files', $rules_names);
+            foreach ($rules as $rule) $this->test($field, $rule, $nullable);
         }
 
         $this->validated = true;
@@ -281,7 +283,7 @@ class Validator
         return (count($this->errors) == 0);
     }
 
-    public function test($field, $rule)
+    public function test($field, $rule, $nullable = false)
     {
         $name = $rule['rule'];
         $data = $rule['data'];
@@ -300,16 +302,16 @@ class Validator
                 $success = !(is_null($value));
                 break;
             case 'integer':
-                $success = (filter_var($value, FILTER_VALIDATE_INT) ? true : false);
+                $success = (filter_var($value, FILTER_VALIDATE_INT) !== false);
                 break;
             case 'float':
-                $success = (filter_var($value, FILTER_VALIDATE_FLOAT) ? true : false);
+                $success = (filter_var($value, FILTER_VALIDATE_FLOAT) !== false);
                 break;
             case 'boolean':
-                $success = (filter_var($value, FILTER_VALIDATE_BOOLEAN) ? true : false);
+                $success = (filter_var($value, FILTER_VALIDATE_BOOLEAN) !== false);
                 break;
             case 'email':
-                $success = (filter_var($value, FILTER_VALIDATE_EMAIL) ? true : false);
+                $success = (filter_var($value, FILTER_VALIDATE_EMAIL) !== false);
                 break;
             case 'phone':
                 $_pattern = "/^\+?\d{7,15}$/";
@@ -353,7 +355,11 @@ class Validator
             // (éwé c'est un switch)
         }
 
-        if (!$success) {
+        if (!$success)
+        {
+            if ($nullable && empty($value))
+                return true;
+
             $this->error($field, $name);
         }