Doctrine

Timestamp:

12/17/08 21:59:39 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Improving error message when validation fails. (closes #1763)

Location:

branches

Files:

• 1.0/lib/Doctrine/Record.php (modified) (1 diff)
• 1.0/lib/Doctrine/Validator/Exception.php (modified) (1 diff)
• 1.0/tests/Ticket/1763TestCase.php (added)
• 1.1/lib/Doctrine/Record.php (modified) (1 diff)
• 1.1/lib/Doctrine/Validator/Exception.php (modified) (1 diff)
• 1.1/tests/Ticket/1763TestCase.php (added)

branches/1.0/lib/Doctrine/Record.php

@@ -454 +454 @@
     public function preDqlDelete($event)
     { }
+
+    /**
+     * Get the record error stack as a human readable string.
+     * Useful for outputting errors to user via web browser
+     *
+     * @return string $message
+     */
+    public function getErrorStackAsString()
+    {
+        $errorStack = $this->getErrorStack();
+
+        if (count($errorStack)) {
+            $message = sprintf("Validation failed in class %s\n\n", get_class($this));
+
+            $message .= "  " . count($errorStack) . " field" . (count($errorStack) > 1 ?  's' : null) . " had validation error" . (count($errorStack) > 1 ?  's' : null) . ":\n\n";
+            foreach ($errorStack as $field => $errors) {
+                $message .= "    * " . count($errors) . " validator" . (count($errors) > 1 ?  's' : null) . " failed on $field (" . implode(", ", $errors) . ")\n";
+            }
+            return $message;
+        } else {
+            return false;
+        }
+    }
 
     /**

branches/1.0/lib/Doctrine/Validator/Exception.php

@@ -63 +63 @@
 
     /**
-     * __toString
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-
-        return parent::__toString();
-    }
-
-    /**
      * Generate a message with all classes that have exceptions
      */
     private function generateMessage()
     {
-        $message = "";
+        $message = '';
         foreach ($this->invalid as $record) {
-           $message .= "Validation error in class " . get_class($record) . " ";
+            $message .= $record->getErrorStackAsString();
         }
         return $message;

branches/1.1/lib/Doctrine/Record.php

@@ -505 +505 @@
     public function postHydrate($event)
     { }
+
+    /**
+     * Get the record error stack as a human readable string.
+     * Useful for outputting errors to user via web browser
+     *
+     * @return string $message
+     */
+    public function getErrorStackAsString()
+    {
+        $errorStack = $this->getErrorStack();
+
+        if (count($errorStack)) {
+            $message = sprintf("Validation failed in class %s\n\n", get_class($this));
+
+            $message .= "  " . count($errorStack) . " field" . (count($errorStack) > 1 ?  's' : null) . " had validation error" . (count($errorStack) > 1 ?  's' : null) . ":\n\n";
+            foreach ($errorStack as $field => $errors) {
+                $message .= "    * " . count($errors) . " validator" . (count($errors) > 1 ?  's' : null) . " failed on $field (" . implode(", ", $errors) . ")\n";
+            }
+            return $message;
+        } else {
+            return false;
+        }
+    }
 
     /**

branches/1.1/lib/Doctrine/Validator/Exception.php

@@ -63 +63 @@
 
     /**
-     * __toString
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-
-        return parent::__toString();
-    }
-
-    /**
      * Generate a message with all classes that have exceptions
      */
     private function generateMessage()
     {
-        $message = "";
+        $message = '';
         foreach ($this->invalid as $record) {
-           $message .= "Validation error in class " . get_class($record) . " ";
+            $message .= $record->getErrorStackAsString();
         }
         return $message;