Use pre and before to gather all data/rules

Author: barryvdh

src/Extension/Validation/ValidationListener.php

@@ -18,7 +18,6 @@ class ValidationListener implements EventSubscriberInterface
 {
     protected $validator;
 
-    protected $rules;
     protected $data;
 
     public function __construct(ValidationFactory $validator)
@@ -32,37 +31,61 @@ public function __construct(ValidationFactory $validator)
     public static function getSubscribedEvents()
     {
         return array(
+                FormEvents::PRE_SUBMIT => 'gatherData',
                 FormEvents::POST_SUBMIT => 'validateRules',
             );
     }
 
-    public function validateRules(FormEvent $event)
+    /**
+     * Get the original data, before submitting
+     *
+     * @param FormEvent $event
+     */
+    public function gatherData(FormEvent $event)
     {
-        $this->rules = [];
-        $this->data = [];
+        $this->data = $event->getData();
+    }
 
+    /**
+     * Find all rules, apply them to the original data and add errors.
+     *
+     * @param FormEvent $event
+     */
+    public function validateRules(FormEvent $event)
+    {
         if ($event->getForm()->isRoot()) {
+
             $root = $event->getForm();
-            $this->parseChildren($root);
+            $rules = $this->findRules($root);
+
+            $validator = $this->validator->make($this->data, $rules);
 
-            $validator = $this->validator->make($this->data, $this->rules);
             if ($validator->fails()) {
+
+                // Add all messages to the original name
                 foreach ($validator->getMessageBag()->toArray() as $name => $messages) {
                     foreach ($messages as $message) {
                         $form = $this->getByDotted($root, $name);
                         $form->addError(new FormError($message));
                     }
                 }
             }
+
         }
     }
 
-    protected function parseChildren(FormInterface $parent, $parentName = null)
+    /**
+     * Recursively find all rules.
+     *
+     * @param FormInterface $parent
+     * @param array $rules
+     * @return array
+     */
+    protected function findRules(FormInterface $parent, $rules = [])
     {
         foreach ($parent->all() as $form) {
             $config = $form->getConfig();
             $name = $form->getName();
-            $this->data[$name] =  $form->getData();
 
             if ($config->hasOption('rules') ) {
 
@@ -74,16 +97,26 @@ protected function parseChildren(FormInterface $parent, $parentName = null)
                     $name .= '.*';
                 }
 
-                if ($parentName) {
-                    $name = $parentName . '.' . $name;
+                if ( ! $parent->isRoot()) {
+                    $name = $parent->getName() . '.' . $name;
                 }
-                $this->rules[$name] = $rule;
+
+                $rules[$name] = $rule;
             }
 
-            $this->parseChildren($form, $form->getName());
+            $rules = $this->findRules($form, $rules);
         }
+
+        return $rules;
     }
 
+    /**
+     * Recursively get the form using the dotted name.
+     *
+     * @param FormInterface $form
+     * @param $name
+     * @return FormInterface
+     */
     protected function getByDotted(FormInterface $form, $name)
     {
         $parts = explode('.', $name);
@@ -95,6 +128,13 @@ protected function getByDotted(FormInterface $form, $name)
         return $form;
     }
 
+    /**
+     * Add default rules based on the type
+     *
+     * @param FormTypeInterface $type
+     * @param array $rules
+     * @return array
+     */
     protected function addTypeRules(FormTypeInterface $type, array $rules)
     {
         if (