Development

Changeset 6937

You must first sign up to be able to contribute.

Changeset 6937

Show
Ignore:
Timestamp:
01/05/08 08:49:30 (8 months ago)
Author:
fabien
Message:

renamed sfValidatorAll to sfValidatorAnd and sfValidatorAny to sfValidatorOr

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/validator/sfValidatorAnd.class.php

    r6196 r6937  
    1010 
    1111/** 
    12  * sfValidatorAll validates an input value if all validators passes. 
     12 * sfValidatorAnd validates an input value if all validators passes. 
    1313 * 
    1414 * @package    symfony 
    …… 
    1717 * @version    SVN: $Id$ 
    1818 */ 
    19 class sfValidatorAll extends sfValidator 
     19class sfValidatorAnd extends sfValidator 
    2020{ 
    2121  protected 
    …… 
    5252    else if (!is_null($validators)) 
    5353    { 
    54       throw new InvalidArgumentException('sfValidatorAll constructor takes a sfValidator object, or a sfValidator array.'); 
     54      throw new InvalidArgumentException('sfValidatorAnd constructor takes a sfValidator object, or a sfValidator array.'); 
    5555    } 
    5656 

  • branches/1.1/lib/validator/sfValidatorFromDescription.class.php

    r6196 r6937  
    340340    $this->operator = $operator; 
    341341    $this->arguments = $arguments; 
    342     $this->class = 'or' == $operator ? 'sfValidatorAny' : 'sfValidatorAll'; 
     342    $this->class = 'or' == $operator ? 'sfValidatorOr' : 'sfValidatorAnd'; 
    343343  } 
    344344 

  • branches/1.1/lib/validator/sfValidatorOr.class.php

    r6196 r6937  
    1010 
    1111/** 
    12  * sfValidatorAny validates an input value if at least one validator passes. 
     12 * sfValidatorOr validates an input value if at least one validator passes. 
    1313 * 
    1414 * @package    symfony 
    …… 
    1717 * @version    SVN: $Id$ 
    1818 */ 
    19 class sfValidatorAny extends sfValidator 
     19class sfValidatorOr extends sfValidator 
    2020{ 
    2121  protected 
    …… 
    5252    else if (!is_null($validators)) 
    5353    { 
    54       throw new InvalidArgumentException('sfValidatorAny constructor takes a sfValidator object, or a sfValidator array.'); 
     54      throw new InvalidArgumentException('sfValidatorOr constructor takes a sfValidator object, or a sfValidator array.'); 
    5555    } 
    5656 

  • branches/1.1/test/unit/validator/sfValidatorAndTest.php

    r6197 r6937  
    1616$v2 = new sfValidatorString(array('min_length' => 3)); 
    1717 
    18 $v = new sfValidatorAll(array($v1, $v2)); 
     18$v = new sfValidatorAnd(array($v1, $v2)); 
    1919 
    2020// __construct() 
    2121$t->diag('__construct()'); 
    22 $v = new sfValidatorAll(); 
     22$v = new sfValidatorAnd(); 
    2323$t->is($v->getValidators(), array(), '->__construct() can take no argument'); 
    24 $v = new sfValidatorAll($v1); 
     24$v = new sfValidatorAnd($v1); 
    2525$t->is($v->getValidators(), array($v1), '->__construct() can take a validator as its first argument'); 
    26 $v = new sfValidatorAll(array($v1, $v2)); 
     26$v = new sfValidatorAnd(array($v1, $v2)); 
    2727$t->is($v->getValidators(), array($v1, $v2), '->__construct() can take an array of validators as its first argument'); 
    2828try 
    2929{ 
    30   $v = new sfValidatorAll('string'); 
     30  $v = new sfValidatorAnd('string'); 
    3131  $t->fail('__construct() throws an exception when passing a non supported first argument'); 
    3232} 
    …… 
    3838// ->addValidator() 
    3939$t->diag('->addValidator()'); 
    40 $v = new sfValidatorAll(); 
     40$v = new sfValidatorAnd(); 
    4141$v->addValidator($v1); 
    4242$v->addValidator($v2); 
    …… 
    9191$v1 = new sfValidatorString(array('max_length' => 3)); 
    9292$v2 = new sfValidatorString(array('min_length' => 3)); 
    93 $v = new sfValidatorAll(array($v1, $v2)); 
     93$v = new sfValidatorAnd(array($v1, $v2)); 
    9494$t->is($v->asString(), <<<EOF 
    9595( 
    …… 
    101101, '->asString() returns a string representation of the validator'); 
    102102 
    103 $v = new sfValidatorAll(array($v1, $v2), array(), array('required' => 'This is required.')); 
     103$v = new sfValidatorAnd(array($v1, $v2), array(), array('required' => 'This is required.')); 
    104104$t->is($v->asString(), <<<EOF 
    105105( 

  • branches/1.1/test/unit/validator/sfValidatorOrTest.php

    r6197 r6937  
    1616$v2 = new sfValidatorString(array('min_length' => 3)); 
    1717 
    18 $v = new sfValidatorAny(array($v1, $v2)); 
     18$v = new sfValidatorOr(array($v1, $v2)); 
    1919 
    2020// __construct() 
    2121$t->diag('__construct()'); 
    22 $v = new sfValidatorAny(); 
     22$v = new sfValidatorOr(); 
    2323$t->is($v->getValidators(), array(), '->__construct() can take no argument'); 
    24 $v = new sfValidatorAny($v1); 
     24$v = new sfValidatorOr($v1); 
    2525$t->is($v->getValidators(), array($v1), '->__construct() can take a validator as its first argument'); 
    26 $v = new sfValidatorAny(array($v1, $v2)); 
     26$v = new sfValidatorOr(array($v1, $v2)); 
    2727$t->is($v->getValidators(), array($v1, $v2), '->__construct() can take an array of validators as its first argument'); 
    2828try 
    2929{ 
    30   $v = new sfValidatorAny('string'); 
     30  $v = new sfValidatorOr('string'); 
    3131  $t->fail('_construct() throws an exception when passing a non supported first argument'); 
    3232} 
    …… 
    3838// ->addValidator() 
    3939$t->diag('->addValidator()'); 
    40 $v = new sfValidatorAny(); 
     40$v = new sfValidatorOr(); 
    4141$v->addValidator($v1); 
    4242$v->addValidator($v2); 
    …… 
    9797$v1 = new sfValidatorString(array('max_length' => 3)); 
    9898$v2 = new sfValidatorString(array('min_length' => 3)); 
    99 $v = new sfValidatorAny(array($v1, $v2)); 
     99$v = new sfValidatorOr(array($v1, $v2)); 
    100100$t->is($v->asString(), <<<EOF 
    101101( 
    …… 
    107107, '->asString() returns a string representation of the validator'); 
    108108 
    109 $v = new sfValidatorAny(array($v1, $v2), array(), array('required' => 'This is required.')); 
     109$v = new sfValidatorOr(array($v1, $v2), array(), array('required' => 'This is required.')); 
    110110$t->is($v->asString(), <<<EOF 
    111111(