RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Empty values now pass email validator

Browse source
This commit is contained in:
pookey 2006-08-15 21:32:59 +00:00
parent f5e54ad77c
commit 76081664b5
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Doctrine/Validator.php
View file

@ -183,12 +183,6 @@ class Doctrine_Validator {
break; break;
} }
} }
/**
if(self::gettype($value) !== $column[0] && self::gettype($value) != 'NULL') {
$err[$key] = Doctrine_Validator::ERR_TYPE;
continue;
}
*/
if( ! self::isValidType($value, $column[0])) { if( ! self::isValidType($value, $column[0])) {
$err[$key] = Doctrine_Validator::ERR_TYPE; $err[$key] = Doctrine_Validator::ERR_TYPE;
continue; continue;

3
Doctrine/Validator/Email.php
View file

@ -8,6 +8,9 @@ class Doctrine_Validator_Email {
* @return boolean * @return boolean
*/ */
public function validate(Doctrine_Record $record, $key, $value, $args) { public function validate(Doctrine_Record $record, $key, $value, $args) {
if(empty($value))
return true;
$parts = explode("@", $value); $parts = explode("@", $value);
if(count($parts) != 2) if(count($parts) != 2)

4
tests/ValidatorTestCase.php
View file

@ -81,7 +81,9 @@ class Doctrine_ValidatorTestCase extends Doctrine_UnitTestCase {
$this->assertTrue(is_array($stack)); $this->assertTrue(is_array($stack));
$stack = $stack['Validator_Test'][0]; $stack = $stack['Validator_Test'][0];
$this->assertEqual($stack['mystring'], Doctrine_Validator::ERR_NOTNULL); $this->assertEqual($stack['mystring'], Doctrine_Validator::ERR_NOTNULL);
$this->assertEqual($stack['myemail2'], Doctrine_Validator::ERR_NOTBLANK);
$test->mystring = 'str'; $test->mystring = 'str';
@ -137,7 +139,7 @@ class Doctrine_ValidatorTestCase extends Doctrine_UnitTestCase {
} }
public function testSave() { public function testSave() {
$this->manager->setAttribute(Doctrine::ATTR_VLD, true); $this->manager->setAttribute(Doctrine::ATTR_VLD, true);
$user = $this->session->getTable("User")->find(4); $user = $this->session->getTable("User")->find(4);
try { try {
$user->name = "this is an example of too long name not very good example but an example nevertheless"; $user->name = "this is an example of too long name not very good example but an example nevertheless";
$user->save(); $user->save();

2
tests/classes.php
View file

@ -382,6 +382,8 @@ class Validator_Test extends Doctrine_Record {
$this->hasColumn("myarray", "array", 1000); $this->hasColumn("myarray", "array", 1000);
$this->hasColumn("myobject", "object", 1000); $this->hasColumn("myobject", "object", 1000);
$this->hasColumn("myinteger", "integer", 11); $this->hasColumn("myinteger", "integer", 11);
$this->hasColumn("myemail", "string", 100, "email");
$this->hasColumn("myemail2", "string", 100, "email|notblank");
} }
} }
?> ?>

4
tests/run.php
View file

@ -34,8 +34,6 @@ $test->addTestCase(new Doctrine_SessionTestCase());
$test->addTestCase(new Doctrine_TableTestCase()); $test->addTestCase(new Doctrine_TableTestCase());
$test->addTestCase(new Doctrine_ValidatorTestCase());
$test->addTestCase(new Doctrine_ManagerTestCase()); $test->addTestCase(new Doctrine_ManagerTestCase());
$test->addTestCase(new Doctrine_AccessTestCase()); $test->addTestCase(new Doctrine_AccessTestCase());
@ -65,6 +63,8 @@ $test->addTestCase(new Doctrine_CustomPrimaryKeyTestCase());
$test->addTestCase(new Doctrine_Filter_TestCase()); $test->addTestCase(new Doctrine_Filter_TestCase());
$test->addTestCase(new Doctrine_ValueHolder_TestCase()); $test->addTestCase(new Doctrine_ValueHolder_TestCase());
$test->addTestCase(new Doctrine_ValidatorTestCase());
//$test->addTestCase(new Doctrine_Cache_FileTestCase()); //$test->addTestCase(new Doctrine_Cache_FileTestCase());
//$test->addTestCase(new Doctrine_Cache_SqliteTestCase()); //$test->addTestCase(new Doctrine_Cache_SqliteTestCase());