Redefining the fix to avoid the BC break

Author: pathumhdes

lib/validator/sfValidatorBoolean.class.php

@@ -33,8 +33,8 @@ class sfValidatorBoolean extends sfValidatorBase
    */
   protected function configure($options = array(), $messages = array())
   {
-    $this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1', 1, true));
-    $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0', 0, false));
+    $this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1'));
+    $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0'));
 
     $this->setOption('required', false);
     $this->setOption('empty_value', false);
@@ -45,12 +45,13 @@ protected function configure($options = array(), $messages = array())
    */
   protected function doClean($value)
   {
-    if (in_array($value, $this->getOption('true_values'), true))
+    $stringValue = $value !== false ? (string) $value : '0';
+    if (in_array($stringValue, $this->getOption('true_values')))
     {
       return true;
     }
 
-    if (in_array($value, $this->getOption('false_values'), true))
+    if (in_array($stringValue, $this->getOption('false_values')))
     {
       return false;
     }

test/unit/validator/sfValidatorBooleanTest.php

@@ -10,7 +10,7 @@
 
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(21);
+$t = new lime_test(23);
 
 $v = new sfValidatorBoolean();
 
@@ -31,6 +31,22 @@
   $t->is($v->clean($false_value), false, '->clean() returns false if the value is in the false_values option');
 }
 
+// other special test cases
+$t->is($v->clean(0), false, '->clean() returns false if the value is 0');
+$t->is($v->clean(false), false, '->clean() returns false if the value is false');
+$t->is($v->clean(1), true, '->clean() returns true if the value is 1');
+$t->is($v->clean(true), true, '->clean() returns true if the value is true');
+$t->is($v->clean(''), false, '->clean() returns false if the value is empty string as empty_value is false by default');
+
+class MyFalseClass
+{
+  public function __toString()
+  {
+    return 'false';
+  }
+}
+$t->is($v->clean(new MyFalseClass()), false, '->clean() returns false if the value is false');
+
 // required is false by default
 $t->is($v->clean(null), false, '->clean() returns false if the value is null');