Doctrine

Timestamp:

08/29/08 21:01:19 (10 months ago)

Author:

jwage

Message:

fixes #1081 - Added pre/postValidate() support

Location:

branches/1.0/lib/Doctrine

Files:

• Event.php (modified) (2 diffs)
• Record.php (modified) (2 diffs)
• Record/Listener.php (modified) (1 diff)
• Record/Listener/Chain.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Event.php

@@ -65 +65 @@
     const RECORD_SERIALIZE   = 25;
     const RECORD_UNSERIALIZE = 26;
+    const RECORD_DQL_DELETE  = 27;
     const RECORD_DQL_SELECT  = 28;
-    const RECORD_DQL_DELETE  = 27;
     const RECORD_DQL_UPDATE  = 29;
+    const RECORD_VALIDATE    = 30;
 
     /**
@@ -192 +193 @@
             case self::RECORD_DQL_UPDATE:
                 return 'update records';
+            case self::RECORD_VALIDATE:
+                return 'validate record';
         }
     }

branches/1.0/lib/Doctrine/Record.php

@@ -286 +286 @@
 
         // Run validation process
-        $validator = new Doctrine_Validator();
-        $validator->validateRecord($this);
-        $this->validate();
-        if ($this->_state == self::STATE_TDIRTY || $this->_state == self::STATE_TCLEAN) {
-            $this->validateOnInsert();
-        } else {
-            $this->validateOnUpdate();
-        }
+        $event = new Doctrine_Event($this, Doctrine_Event::RECORD_VALIDATE);
+        $this->preValidate($event);
+        $this->getTable()->getRecordListener()->preValidate($event);
+        
+        if ( ! $event->skipOperation) {
+        
+            $validator = new Doctrine_Validator();
+            $validator->validateRecord($this);
+            $this->validate();
+            if ($this->_state == self::STATE_TDIRTY || $this->_state == self::STATE_TCLEAN) {
+                $this->validateOnInsert();
+            } else {
+                $this->validateOnUpdate();
+            }
+        }
+
+        $this->getTable()->getRecordListener()->postValidate($event);
+        $this->postValidate($event);
 
         return $this->getErrorStack()->count() == 0 ? true : false;
@@ -408 +418 @@
      */
     public function postInsert($event)
+    { }
+
+    /**
+     * Empty template method to provide concrete Record classes with the possibility
+     * to hook into the validation procedure. Useful for cleaning up data before 
+     * validating it.
+     */
+    public function preValidate($event)
+    { }
+    /**
+     * Empty template method to provide concrete Record classes with the possibility
+     * to hook into the validation procedure.
+     */
+    public function postValidate($event)
     { }
 

branches/1.0/lib/Doctrine/Record/Listener.php

@@ -83 +83 @@
     public function postHydrate(Doctrine_Event $event)
     { }
+
+    public function preValidate(Doctrine_Event $event)
+    { }
+    
+    public function postValidate(Doctrine_Event $event)
+    { }
 }

branches/1.0/lib/Doctrine/Record/Listener/Chain.php

@@ -207 +207 @@
         }
     }
+    
+    public function preValidate(Doctrine_Event $event)
+    { 
+        foreach ($this->_listeners as $listener) {
+            $listener->preValidate($event);
+        }
+    }
+    
+    public function postValidate(Doctrine_Event $event)
+    {
+        foreach ($this->_listeners as $listener) {
+            $listener->postValidate($event);
+        }
+    }
 }