Improved validation API

require_once bug fix

classes/Collection.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once("Access.class.php");
 /**
  * Doctrine_Collection
  * Collection of Doctrine_Record objects.

classes/Collection/Lazy.class.php

@@ -1,5 +1,5 @@
 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Collection.class.php");
+require_once("Batch.class.php");
 /**
  * a collection of Doctrine_Record objects with lazy load strategy 
  * (batch load strategy with batch size 1)

classes/Exception/Find.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
 /**
  * thrown when user tries to find a Doctrine_Record for given primary key and that object is not found
  */

classes/Exception/Mapping.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
 /**
  * thrown when user tries to get a foreign key object but the mapping is not done right
  */

classes/Exception/Naming.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
 /**
  * thrown when user defined Doctrine_Table is badly named
  */

classes/Exception/PrimaryKey.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
 /**
  * thrown when Doctrine_Record is loaded and there is no primary key field
  */

classes/Exception/Refresh.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
 /**
  * thrown when Doctrine_Record is refreshed and the refreshed primary key doens't match the old one
  */

classes/Exception/Session.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
 /**
  * thrown when user tries to get the current 
  * session and there are no open sessions

classes/Exception/Table.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
 /**
  * thrown when user tries to initialize a new instance of Doctrine_Table, 
  * while there already exists an instance of that table

classes/Exception/Validator.class.php

@@ -1,4 +1,6 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.class.php");
+
 class Doctrine_Validator_Exception extends Doctrine_Exception {
     private $validator;
     public function __construct(Doctrine_Validator $validator) {

classes/Query.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once("Access.class.php");
 /**
  * Doctrine_Query
  *

classes/Record.class.php

@@ -533,6 +533,31 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
             $this->references[$name] = $value;
         }
     }
+    /**
+     * __isset
+     *
+     * @param string $name
+     * @return boolean
+     */
+    public function __isset($name) {
+        if(isset($this->data[$name]))
+            return true;
+
+        if(isset($this->references[$name]))
+            return true;
+
+        return false;
+    }
+    /**
+     * @param string $name
+     * @return void
+     */
+    public function __unset($name) {
+        if(isset($this->data[$name]))
+            $this->data[$name] = array();
+
+        // todo: what to do with references ?
+    }
     /**
      * applies the changes made to this object into database
      * this method is smart enough to know if any changes are made

classes/Session/Common.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Session.class.php");
 /**
  * standard session, the parent of pgsql, mysql and sqlite
  */

classes/Session/Firebird.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Session.class.php");
 /**
  * firebird driver
  */

classes/Session/Informix.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Session.class.php");
 /**
  * informix database driver
  */

classes/Session/Mssql.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Session.class.php");
 /**
  * mssql driver
  */

classes/Session/Mysql.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once("Common.class.php");
 /**
  * mysql driver
  */

classes/Session/Oracle.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Session.class.php");
 /**
  * oracle driver
  */

classes/Session/Pgsql.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once("Common.class.php");
 /**
  * pgsql driver
  */

classes/Session/Sqlite.class.php

@@ -1,4 +1,5 @@
 <?php
+require_once("Common.class.php");
 /**
  * sqlite driver
  */

classes/Validator.class.php

@@ -28,6 +28,29 @@ class Doctrine_Validator {
      * constant for unique validation error
      */
     const ERR_UNIQUE    = 3;
+    /**
+     * constant for blank validation error
+     */
+    const ERR_BLANK     = 4;
+    /**
+     * constant for date validation error
+     */
+    const ERR_DATE      = 5;
+    /**
+     * constant for null validation error
+     */
+    const ERR_NULL      = 6;
+    /**
+     * constant for enum validation error
+     */
+    const ERR_ENUM      = 7;
+    /**
+     * constant for range validation error
+     */
+    const ERR_RANGE     = 8;
+
+
+
     
     /**
      * @var array $stack            error stack
@@ -84,20 +107,35 @@ class Doctrine_Validator {
             $e = explode("|",$column[2]);
 
             foreach($e as $k => $arg) {
-                if(empty($arg) || $arg == "primary")
+                if(empty($arg) || $arg == "primary" || $arg == "protected" || $arg == "autoincrement")
                     continue;
 
-                $validator = self::getValidator($arg);
+                $args = explode(":",$arg);
-                if( ! $validator->validate($record,$key,$value)) {
+                if( ! isset($args[1])) 
-                    switch(strtolower($arg)):
+                    $args[1] = '';
+
+                $validator = self::getValidator($args[0]);
+                if( ! $validator->validate($record, $key, $value, $args[1])) {
+                    switch(strtolower($args[0])):
                         case "unique":
                             $err[$key] = Doctrine_Validator::ERR_UNIQUE;
                         break;
+                        case "notnull":
+                            $err[$key] = Doctrine_Validator::ERR_NULL;
+                        break;
+                        case "notblank":
+                            $err[$key] = Doctrine_Validator::ERR_BLANK;
+                        break;
+                        case "enum":
+                            $err[$key] = Doctrine_Validator::ERR_VALID;
+                        break;
                         default:
                             $err[$key] = Doctrine_Validator::ERR_VALID;
                         break;
                     endswitch;
                 }
+                
+                // errors found quit validation looping for this column
                 if(isset($err[$key]))
                     break;
             }

classes/Validator/Country.class.php

@@ -254,9 +254,10 @@ class Doctrine_Validator_Country {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         return isset(self::$countries[$value]);
 	}
 

classes/Validator/Date.class.php

@@ -4,9 +4,10 @@ class Doctrine_Validator_Date {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         return checkdate($value);
     }
 }

classes/Validator/Email.class.php

@@ -4,9 +4,10 @@ class Doctrine_Validator_Email {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         $parts = explode("@", $value);
 
         if(count($parts) != 2) 

classes/Validator/Htmlcolor.class.php

@@ -4,9 +4,10 @@ class Doctrine_Validator_HtmlColor {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         if( ! preg_match("/^#{0,1}[0-9]{6}$/",$color)) {
             return false;
         }

classes/Validator/Ip.class.php

@@ -4,9 +4,10 @@ class Doctrine_Validator_Ip {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         $e = explode(".",$request);
         if(count($e) != 4) return false;
 

classes/Validator/Nospace.class.php

@@ -4,9 +4,10 @@ class Doctrine_Validator_NoSpace {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         if(preg_match("/[\s\r\t\n]/", $value))
             return false;
 

classes/Validator/Notblank.class.php

@@ -4,15 +4,18 @@ class Doctrine_Validator_Notblank {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         $string = str_replace("\n","",$value);
         $string = str_replace("\r","",$string);
         $string = str_replace("\t","",$string);
         $string = str_replace("\s","",$string);
         $string = str_replace(" ","",$string);
-        if($string == "") return true;
+        if($string == "") return false;
+        
+        return true;
     }
 }
 ?>

classes/Validator/Range.class.php

@@ -16,9 +16,10 @@ class Doctrine_Validator_Range {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         if($var < $this->min)
             return false;
 

classes/Validator/Regexp.class.php

@@ -4,9 +4,10 @@ class Doctrine_Validator_Regexp {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         return $value;
     }
 }

classes/Validator/Unique.class.php

@@ -4,9 +4,10 @@ class Doctrine_Validator_Unique {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         $table = $record->getTable();
         $sql   = "SELECT id FROM ".$table->getTableName()." WHERE ".$key." = ?";
         $stmt  = $table->getSession()->getDBH()->prepare($sql);

classes/Validator/Usstate.class.php

@@ -62,9 +62,10 @@ class ValidatorUSState {
      * @param Doctrine_Record $record
      * @param string $key
      * @param mixed $value
+     * @param string $args
      * @return boolean
      */
-    public function validate(Doctrine_Record $record, $key, $value) {
+    public function validate(Doctrine_Record $record, $key, $value, $args) {
         return isset(self::$states[$value]);
 	}
 }

tests/ValidatorTestCase.class.php

@@ -39,13 +39,13 @@ class Doctrine_ValidatorTestCase extends Doctrine_UnitTestCase {
         $validator = new Doctrine_Validator_Email();
 
         $email = $this->session->create("Email");
-        $this->assertFalse($validator->validate($email,"address","example@example"));
+        $this->assertFalse($validator->validate($email,"address","example@example",null));
-        $this->assertFalse($validator->validate($email,"address","example@@example"));
+        $this->assertFalse($validator->validate($email,"address","example@@example",null));
-        $this->assertFalse($validator->validate($email,"address","example@example."));
+        $this->assertFalse($validator->validate($email,"address","example@example.",null));
-        $this->assertFalse($validator->validate($email,"address","example@e.."));
+        $this->assertFalse($validator->validate($email,"address","example@e..",null));
 
-        $this->assertFalse($validator->validate($email,"address","example@e.."));
+        $this->assertFalse($validator->validate($email,"address","example@e..",null));
-        $this->assertTrue($validator->validate($email,"address","example@e.e.e.e.e"));
+        $this->assertTrue($validator->validate($email,"address","example@e.e.e.e.e",null));
 
     }
     public function testSave() {