[Form] Merged Field and Form. Merged FieldBuilder and FormBuilder. Af…

…ter the refactoring, the distinction between the two concepts is small enough to merge them
symfony · Mar 20, 2011 · 889a160 · 889a160
1 parent b620dc6
commit 889a160
Show file tree

Hide file tree

Showing 62 changed files with 993 additions and 1,148 deletions.
diff --git a/DataMapper/DataMapperInterface.php b/DataMapper/DataMapperInterface.php
@@ -11,18 +11,17 @@
 
 namespace Symfony\Component\Form\DataMapper;
 
-use Symfony\Component\Form\FieldInterface;
 use Symfony\Component\Form\FormInterface;
 
 interface DataMapperInterface
 {
     function createEmptyData();
 
-    function mapDataToForm(&$data, FormInterface $form);
+    function mapDataToForms($data, array $forms);
 
-    function mapDataToField(&$data, FieldInterface $field);
+    function mapDataToForm($data, FormInterface $form);
 
-    function mapFormToData(FormInterface $form, &$data);
+    function mapFormsToData(array $forms, &$data);
 
-    function mapFieldToData(FieldInterface $field, &$data);
+    function mapFormToData(FormInterface $field, &$data);
 }
diff --git a/DataMapper/PropertyPathMapper.php b/DataMapper/PropertyPathMapper.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Form\DataMapper;
 
-use Symfony\Component\Form\FieldInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\RecursiveFieldIterator;
 use Symfony\Component\Form\Exception\FormException;
@@ -51,7 +50,7 @@ public function createEmptyData()
         return array();
     }
 
-    public function mapDataToForm(&$data, FormInterface $form)
+    public function mapDataToForms($data, array $forms)
     {
         if (!empty($data) && !is_array($data) && !is_object($data)) {
             throw new \InvalidArgumentException(sprintf('Expected argument of type object or array, %s given', gettype($data)));
@@ -62,49 +61,51 @@ public function mapDataToForm(&$data, FormInterface $form)
                 throw new FormException(sprintf('Form data should be instance of %s', $this->dataClass));
             }
 
-            $iterator = new RecursiveFieldIterator($form);
+            $iterator = new RecursiveFieldIterator($forms);
             $iterator = new \RecursiveIteratorIterator($iterator);
 
-            foreach ($iterator as $field) {
-                $this->mapDataToField($data, $field);
+            foreach ($iterator as $form) {
+                $this->mapDataToForm($data, $form);
             }
         }
     }
 
-    public function mapDataToField(&$data, FieldInterface $field)
+    public function mapDataToForm($data, FormInterface $form)
     {
-        if ($field->getAttribute('property_path') !== null) {
-            $field->setData($field->getAttribute('property_path')->getValue($data));
+        if (!empty($data)) {
+            if ($form->getAttribute('property_path') !== null) {
+                $form->setData($form->getAttribute('property_path')->getValue($data));
+            }
         }
     }
 
-    public function mapFormToData(FormInterface $form, &$data)
+    public function mapFormsToData(array $forms, &$data)
     {
-        $iterator = new RecursiveFieldIterator($form);
+        $iterator = new RecursiveFieldIterator($forms);
         $iterator = new \RecursiveIteratorIterator($iterator);
 
-        foreach ($iterator as $field) {
+        foreach ($iterator as $form) {
             $isReference = false;
 
             // If the data is identical to the value in $data, we are
             // dealing with a reference
-            if ($field->getAttribute('property_path') !== null) {
-                $isReference = $field->getData() === $field->getAttribute('property_path')->getValue($data);
+            if ($form->getAttribute('property_path') !== null) {
+                $isReference = $form->getData() === $form->getAttribute('property_path')->getValue($data);
             }
 
             // Don't write into $data if $data is an object,
             // $isReference is true (see above) and the option "by_reference" is
             // true as well
-            if (!is_object($data) || !$isReference || !$field->getAttribute('by_reference')) {
-                $this->mapFieldToData($field, $data);
+            if (!is_object($data) || !$isReference || !$form->getAttribute('by_reference')) {
+                $this->mapFormToData($form, $data);
             }
         }
     }
 
-    public function mapFieldToData(FieldInterface $field, &$data)
+    public function mapFormToData(FormInterface $form, &$data)
     {
-        if ($field->getAttribute('property_path') !== null) {
-            $field->getAttribute('property_path')->setValue($data, $field->getData());
+        if ($form->getAttribute('property_path') !== null) {
+            $form->getAttribute('property_path')->setValue($data, $form->getData());
         }
     }
 }
diff --git a/Event/DataEvent.php b/Event/DataEvent.php
@@ -3,15 +3,15 @@
 namespace Symfony\Component\Form\Event;
 
 use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\Form\FieldInterface;
+use Symfony\Component\Form\FormInterface;
 
 class DataEvent extends Event
 {
     private $field;
 
     protected $data;
 
-    public function __construct(FieldInterface $field, $data)
+    public function __construct(FormInterface $field, $data)
     {
         $this->field = $field;
         $this->data = $data;

diff --git a/EventListener/FixFileUploadListener.php b/EventListener/FixFileUploadListener.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\EventListener;
 
-use Symfony\Component\Form\FieldInterface;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Events;
 use Symfony\Component\Form\Event\FilterDataEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/EventListener/FixRadioInputListener.php b/EventListener/FixRadioInputListener.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\EventListener;
 
-use Symfony\Component\Form\FieldInterface;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Events;
 use Symfony\Component\Form\Event\FilterDataEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/EventListener/FixUrlProtocolListener.php b/EventListener/FixUrlProtocolListener.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\EventListener;
 
-use Symfony\Component\Form\FieldInterface;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Events;
 use Symfony\Component\Form\Event\FilterDataEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/EventListener/ResizeFormListener.php b/EventListener/ResizeFormListener.php
@@ -13,9 +13,8 @@
 
 use Symfony\Component\Form\Events;
 use Symfony\Component\Form\Event\DataEvent;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\Form\FieldInterface;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;