Merge pull request #2 from thestanislav/hotfix/patch-1

Fixes
fabiocarneiro · Nov 21, 2013 · 016f572 · 016f572
2 parents 13419ba + 36d7c3c
commit 016f572
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/FhcsFormTest/Controller/IndexController.php b/src/FhcsFormTest/Controller/IndexController.php
@@ -26,7 +26,7 @@ public function indexAction() {
         $freight->addProduct($product).
         $order->addFreight($freight);
 
-        $form = $this->getFormElementManager()->get('FhcsFormTest\Form\SomeForm');
+        $form = $this->getFormElementManager()->get('FhcsFormTest\Form\OrderFieldset');
         $form->bind($order);
 
         return array('form' => $form);

diff --git a/src/FhcsFormTest/Form/FreightFieldset.php b/src/FhcsFormTest/Form/FreightFieldset.php
@@ -7,20 +7,20 @@
 use DoctrineModule\Stdlib\Hydrator\DoctrineObject as DoctrineHydrator;
 
 class FreightFieldset extends Fieldset {
-    
+
     protected $entityManager;
-    
+
     public function getEntityManager() {
         return $this->entityManager;
     }
 
     public function setEntityManager($entityManager) {
         $this->entityManager = $entityManager;
     }
-    
+
     public function init(){
-        $this->setHydrator(new DoctrineHydrator($this->getEntityManager(), 'FhcsFormTest\Entity\Freight'))->setObject(new Freight());
-        
+        $this->setHydrator(new DoctrineHydrator($this->getEntityManager()));
+
         $this->add(array(
             'type' => 'Zend\Form\Element\Collection',
             'name' => 'products',
@@ -30,5 +30,6 @@ public function init(){
                 )
             )
         ));
+        $this->get('products')->setHydrator(new DoctrineHydrator($this->getEntityManager()));
     }
 }
diff --git a/src/FhcsFormTest/Form/OrderFieldset.php b/src/FhcsFormTest/Form/OrderFieldset.php
@@ -2,14 +2,14 @@
 
 namespace FhcsFormTest\Form;
 
-use Zend\Form\Fieldset;
+use Zend\Form\Form;
 use FhcsFormTest\Entity\Order;
 use DoctrineModule\Stdlib\Hydrator\DoctrineObject as DoctrineHydrator;
 
-class OrderFieldset extends Fieldset{
-    
+class OrderFieldset extends Form{
+
     protected $entityManager;
-    
+
     public function getEntityManager() {
         return $this->entityManager;
     }
@@ -29,5 +29,6 @@ public function init(){
                 )
             )
         ));
+        $this->get('freights')->setHydrator(new DoctrineHydrator($this->getEntityManager()));
     }
 }
diff --git a/src/FhcsFormTest/Form/ProductFieldset.php b/src/FhcsFormTest/Form/ProductFieldset.php
@@ -20,7 +20,7 @@ public function setEntityManager($entityManager) {
 
     public function init() {
 
-        $this->setHydrator(new DoctrineHydrator($this->getEntityManager(), 'FhcsFormTest\Entity\Product'))->setObject(new Product());
+        $this->setHydrator(new DoctrineHydrator($this->getEntityManager(), 'FhcsFormTest\Entity\Product'));
 
         $this->add(array(
             'type' => 'text',