tamirvs
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
Lines changed: 24 additions & 5 deletions b/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
Lines changed: 24 additions & 5 deletions
diff --git a/‎src/Symfony/Component/Form/CHANGELOG.md
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Form/CHANGELOG.md
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
Lines changed: 11 additions & 6 deletions b/‎src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
Lines changed: 11 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
Lines changed: 26 additions & 3 deletions b/‎src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
Lines changed: 26 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Form.php
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Form/Form.php
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/FormError.php
Lines changed: 83 additions & 3 deletions b/‎src/Symfony/Component/Form/FormError.php
Lines changed: 83 additions & 3 deletions
@@ -191,7 +191,7 @@
             </div>
 
             {% for formName, formData in collector.data.forms %}
-                {{ form_tree_details(formName, formData) }}
+                {{ form_tree_details(formName, formData, collector.data.forms_by_hash) }}
             {% endfor %}
         </div>
     {% else %}
@@ -366,7 +366,7 @@
     </li>
 {% endmacro %}
 
-{% macro form_tree_details(name, data) %}
+{% macro form_tree_details(name, data, forms_by_hash) %}
     <div class="tree-details" id="{{ data.id }}-details">
         <h2>
             {{ name }}
@@ -386,13 +386,32 @@
 
             <table id="{{ data.id }}-errors">
                 <tr>
-                    <th width="50%">Message</th>
+                    <th>Message</th>
+                    <th>Origin</th>
                     <th>Cause</th>
                 </tr>
                 {% for error in data.errors %}
                 <tr>
                     <td>{{ error.message }}</td>
-                    <td><em>Unknown.</em></td>
+                    <td>
+                        {% if error.origin is empty %}
+                            <em>This form.</em>
+                        {% elseif forms_by_hash[error.origin] is not defined %}
+                            <em>Unknown.</em>
+                        {% else %}
+                            {{ forms_by_hash[error.origin].name }}
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if error.cause is empty %}
+                            <em>Unknown.</em>
+                        {% elseif error.cause.root is defined %}
+                            <strong>Constraint Violation</strong><br/>
+                            <pre>{{ error.cause.root }}{% if error.cause.path is not empty %}{% if error.cause.path|first != '[' %}.{% endif %}{{ error.cause.path }}{% endif %} = {{ error.cause.value }}</pre>
+                        {% else %}
+                            <pre>{{ error.cause }}</pre>
+                        {% endif %}
+                    </td>
                 </tr>
                 {% endfor %}
             </table>
@@ -565,6 +584,6 @@
     </div>
 
     {% for childName, childData in data.children %}
-        {{ _self.form_tree_details(childName, childData) }}
+        {{ _self.form_tree_details(childName, childData, forms_by_hash) }}
     {% endfor %}
 {% endmacro %}
@@ -5,6 +5,8 @@ CHANGELOG
 ------
 
  * added an option for multiple files upload
+ * form errors now reference their cause (constraint violation, exception, ...)
+ * form errors now remember which form they were originally added to
 
 2.4.0
 -----
 
@@ -69,6 +69,7 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
         $this->dataExtractor = $dataExtractor;
         $this->data = array(
             'forms' => array(),
+            'forms_by_hash' => array(),
             'nb_errors' => 0,
         );
     }
@@ -184,7 +185,7 @@ public function buildPreliminaryFormTree(FormInterface $form)
     {
         $this->data['forms'][$form->getName()] = array();
 
-        $this->recursiveBuildPreliminaryFormTree($form, $this->data['forms'][$form->getName()]);
+        $this->recursiveBuildPreliminaryFormTree($form, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);
     }
 
     /**
@@ -194,7 +195,7 @@ public function buildFinalFormTree(FormInterface $form, FormView $view)
     {
         $this->data['forms'][$form->getName()] = array();
 
-        $this->recursiveBuildFinalFormTree($form, $view, $this->data['forms'][$form->getName()]);
+        $this->recursiveBuildFinalFormTree($form, $view, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);
     }
 
     /**
@@ -213,24 +214,26 @@ public function getData()
         return $this->data;
     }
 
-    private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output = null)
+    private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output = null, array &$outputByHash)
     {
         $hash = spl_object_hash($form);
 
         $output = isset($this->dataByForm[$hash])
             ? $this->dataByForm[$hash]
             : array();
 
+        $outputByHash[$hash] = &$output;
+
         $output['children'] = array();
 
         foreach ($form as $name => $child) {
             $output['children'][$name] = array();
 
-            $this->recursiveBuildPreliminaryFormTree($child, $output['children'][$name]);
+            $this->recursiveBuildPreliminaryFormTree($child, $output['children'][$name], $outputByHash);
         }
     }
 
-    private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output = null)
+    private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output = null, array &$outputByHash)
     {
         $viewHash = spl_object_hash($view);
         $formHash = null;
@@ -255,6 +258,8 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
                     ? $this->dataByForm[$formHash]
                     : array()
             );
+
+            $outputByHash[$formHash] = &$output;
         }
 
         $output['children'] = array();
@@ -268,7 +273,7 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
 
             $output['children'][$name] = array();
 
-            $this->recursiveBuildFinalFormTree($childForm, $childView, $output['children'][$name]);
+            $this->recursiveBuildFinalFormTree($childForm, $childView, $output['children'][$name], $outputByHash);
         }
     }
 }
@@ -14,6 +14,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+use Symfony\Component\Validator\ConstraintViolationInterface;
 
 /**
  * Default implementation of {@link FormDataExtractorInterface}.
@@ -43,6 +44,7 @@ public function extractConfiguration(FormInterface $form)
     {
         $data = array(
             'id' => $this->buildId($form),
+            'name' => $form->getName(),
             'type' => $form->getConfig()->getType()->getName(),
             'type_class' => get_class($form->getConfig()->getType()->getInnerType()),
             'synchronized' => $this->valueExporter->exportValue($form->isSynchronized()),
@@ -108,9 +110,26 @@ public function extractSubmittedData(FormInterface $form)
         }
 
         foreach ($form->getErrors() as $error) {
-            $data['errors'][] = array(
+            $errorData = array(
                 'message' => $error->getMessage(),
+                'origin' => is_object($error->getOrigin())
+                    ? spl_object_hash($error->getOrigin())
+                    : null,
             );
+
+            $cause = $error->getCause();
+
+            if ($cause instanceof ConstraintViolationInterface) {
+                $errorData['cause'] = array(
+                    'root' => $this->valueExporter->exportValue($cause->getRoot()),
+                    'path' => $this->valueExporter->exportValue($cause->getPropertyPath()),
+                    'value' => $this->valueExporter->exportValue($cause->getInvalidValue()),
+                );
+            } else {
+                $errorData['cause'] = null !== $cause ? $this->valueExporter->exportValue($cause) : null;
+            }
+
+            $data['errors'][] = $errorData;
         }
 
         $data['synchronized'] = $this->valueExporter->exportValue($form->isSynchronized());
@@ -127,8 +146,12 @@ public function extractViewVariables(FormView $view)
 
         // Set the ID in case no FormInterface object was collected for this
         // view
-        if (isset($view->vars['id'])) {
-            $data['id'] = $view->vars['id'];
+        if (!isset($data['id'])) {
+            $data['id'] = isset($view->vars['id']) ? $view->vars['id'] : null;
+        }
+
+        if (!isset($data['name'])) {
+            $data['name'] = isset($view->vars['name']) ? $view->vars['name'] : null;
         }
 
         foreach ($view->vars as $varName => $value) {
 
@@ -128,7 +128,8 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
                 $violation->getMessage(),
                 $violation->getMessageTemplate(),
                 $violation->getMessageParameters(),
-                $violation->getMessagePluralization()
+                $violation->getMessagePluralization(),
+                $violation
             ));
         }
     }
 
@@ -673,6 +673,10 @@ public function bind($submittedData)
     public function addError(FormError $error)
     {
         if ($this->parent && $this->config->getErrorBubbling()) {
+            if (null === $error->getOrigin()) {
+                $error->setOrigin($this);
+            }
+
             $this->parent->addError($error);
         } else {
             $this->errors[] = $error;
 
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Form;
 
+use Symfony\Component\Form\Exception\BadMethodCallException;
+
 /**
  * Wraps errors in forms
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class FormError
+class FormError implements \Serializable
 {
     /**
      * @var string
@@ -41,6 +43,18 @@ class FormError
      */
     protected $messagePluralization;
 
+    /**
+     * The cause for this error
+     * @var mixed
+     */
+    private $cause;
+
+    /**
+     * The form that spawned this error
+     * @var FormInterface
+     */
+    private $origin;
+
     /**
      * Constructor
      *
@@ -50,17 +64,19 @@ class FormError
      * @param string       $message              The translated error message
      * @param string|null  $messageTemplate      The template for the error message
      * @param array        $messageParameters    The parameters that should be
-     *                                           substituted in the message template.
+     *                                           substituted in the message template
      * @param integer|null $messagePluralization The value for error message pluralization
+     * @param mixed        $cause                The cause of the error
      *
      * @see \Symfony\Component\Translation\Translator
      */
-    public function __construct($message, $messageTemplate = null, array $messageParameters = array(), $messagePluralization = null)
+    public function __construct($message, $messageTemplate = null, array $messageParameters = array(), $messagePluralization = null, $cause = null)
     {
         $this->message = $message;
         $this->messageTemplate = $messageTemplate ?: $message;
         $this->messageParameters = $messageParameters;
         $this->messagePluralization = $messagePluralization;
+        $this->cause = $cause;
     }
 
     /**
@@ -102,4 +118,68 @@ public function getMessagePluralization()
     {
         return $this->messagePluralization;
     }
+
+    /**
+     * Returns the cause of this error.
+     *
+     * @return mixed The cause of this error
+     */
+    public function getCause()
+    {
+        return $this->cause;
+    }
+
+    /**
+     * Sets the form that caused this error.
+     *
+     * This method must only be called once.
+     *
+     * @param FormInterface $origin The form that caused this error
+     *
+     * @throws BadMethodCallException If the method is called more than once
+     */
+    public function setOrigin(FormInterface $origin)
+    {
+        if (null !== $this->origin) {
+            throw new BadMethodCallException('setOrigin() must only be called once.');
+        }
+
+        $this->origin = $origin;
+    }
+
+    /**
+     * Returns the form that caused this error.
+     *
+     * @return FormInterface The form that caused this error
+     */
+    public function getOrigin()
+    {
+        return $this->origin;
+    }
+
+    /**
+     * Serializes this error.
+     *
+     * @return string The serialized error
+     */
+    public function serialize()
+    {
+        return serialize(array(
+            $this->message,
+            $this->messageTemplate,
+            $this->messageParameters,
+            $this->messagePluralization,
+            $this->cause
+        ));
+    }
+
+    /**
+     * Unserializes a serialized error.
+     *
+     * @param string $serialized The serialized error
+     */
+    public function unserialize($serialized)
+    {
+        list($this->message, $this->messageTemplate, $this->messageParameters, $this->messagePluralization, $this->cause) = u
3C5E
nserialize($serialized);
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public function __construct(FormDataExtractorInterface $dataExtractor)`
`69`	`69`	`$this->dataExtractor = $dataExtractor;`
`70`	`70`	`$this->data = array(`
`71`	`71`	`'forms' => array(),`
	`72`	`+ 'forms_by_hash' => array(),`
`72`	`73`	`'nb_errors' => 0,`
`73`	`74`	`);`
`74`	`75`	`}`
`@@ -184,7 +185,7 @@ public function buildPreliminaryFormTree(FormInterface $form)`
`184`	`185`	`{`
`185`	`186`	`$this->data['forms'][$form->getName()] = array();`
`186`	`187`
`187`		`- $this->recursiveBuildPreliminaryFormTree($form, $this->data['forms'][$form->getName()]);`
	`188`	`+ $this->recursiveBuildPreliminaryFormTree($form, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`/**`
`@@ -194,7 +195,7 @@ public function buildFinalFormTree(FormInterface $form, FormView $view)`
`194`	`195`	`{`
`195`	`196`	`$this->data['forms'][$form->getName()] = array();`
`196`	`197`
`197`		`- $this->recursiveBuildFinalFormTree($form, $view, $this->data['forms'][$form->getName()]);`
	`198`	`+ $this->recursiveBuildFinalFormTree($form, $view, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);`
`198`	`199`	`}`
`199`	`200`
`200`	`201`	`/**`
`@@ -213,24 +214,26 @@ public function getData()`
`213`	`214`	`EF5E return $this->data;`
`214`	`215`	`}`
`215`	`216`
`216`		`- private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output = null)`
	`217`	`+ private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output = null, array &$outputByHash)`
`217`	`218`	`{`
`218`	`219`	`$hash = spl_object_hash($form);`
`219`	`220`
`220`	`221`	`$output = isset($this->dataByForm[$hash])`
`221`	`222`	`? $this->dataByForm[$hash]`
`222`	`223`	`: array();`
`223`	`224`
	`225`	`+ $outputByHash[$hash] = &$output;`
	`226`	`+`
`224`	`227`	`$output['children'] = array();`
`225`	`228`
`226`	`229`	`foreach ($form as $name => $child) {`
`227`	`230`	`$output['children'][$name] = array();`
`228`	`231`
`229`		`- $this->recursiveBuildPreliminaryFormTree($child, $output['children'][$name]);`
	`232`	`+ $this->recursiveBuildPreliminaryFormTree($child, $output['children'][$name], $outputByHash);`
`230`	`233`	`}`
`231`	`234`	`}`
`232`	`235`
`233`		`- private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output = null)`
	`236`	`+ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output = null, array &$outputByHash)`
`234`	`237`	`{`
`235`	`238`	`$viewHash = spl_object_hash($view);`
`236`	`239`	`$formHash = null;`
`@@ -255,6 +258,8 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie`
`255`	`258`	`? $this->dataByForm[$formHash]`
`256`	`259`	`: array()`
`257`	`260`	`);`
	`261`	`+`
	`262`	`+ $outputByHash[$formHash] = &$output;`
`258`	`263`	`}`
`259`	`264`
`260`	`265`	`$output['children'] = array();`
`@@ -268,7 +273,7 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie`
`268`	`273`
`269`	`274`	`$output['children'][$name] = array();`
`270`	`275`
`271`		`- $this->recursiveBuildFinalFormTree($childForm, $childView, $output['children'][$name]);`
	`276`	`+ $this->recursiveBuildFinalFormTree($childForm, $childView, $output['children'][$name], $outputByHash);`
`272`	`277`	`}`
`273`	`278`	`}`
`274`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,8 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form`
`128`	`128`	`$violation->getMessage(),`
`129`	`129`	`$violation->getMessageTemplate(),`
`130`	`130`	`$violation->getMessageParameters(),`
`131`		`- $violation->getMessagePluralization()`
	`131`	`+ $violation->getMessagePluralization(),`
	`132`	`+ $violation`
`132`	`133`	`));`
`133`	`134`	`}`
`134`	`135`	`}`