From 0e549ea6c76496174c6a8316f04b1bd4366453f2 Mon Sep 17 00:00:00 2001
From: JhonnyL <jhonny.lidfors@screeninteraction.com>
Date: Wed, 2 Sep 2015 09:31:38 +0200
Subject: [PATCH 1/2] Fix EntityManager namespace

---
 cookbook/form/data_transformers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/form/data_transformers.rst b/cookbook/form/data_transformers.rst
index 946174d10b4..dcaad7a2461 100644
--- a/cookbook/form/data_transformers.rst
+++ b/cookbook/form/data_transformers.rst
@@ -161,7 +161,7 @@ to and from the issue number and the ``Issue`` object::
     namespace AppBundle\Form\DataTransformer;
 
     use AppBundle\Entity\Issue;
-    use Doctrine\Common\Persistence\EntityManager;
+    use Doctrine\ORM\EntityManager;
     use Symfony\Component\Form\DataTransformerInterface;
     use Symfony\Component\Form\Exception\TransformationFailedException;
 

From 2a7e9e87d890b2039309d14bfbb27eef9c6cf906 Mon Sep 17 00:00:00 2001
From: JhonnyL <jhonny.lidfors@screeninteraction.com>
Date: Thu, 3 Sep 2015 08:55:31 +0200
Subject: [PATCH 2/2] Use ObjectManager instead of EntityManager

---
 cookbook/form/data_transformers.rst | 34 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/cookbook/form/data_transformers.rst b/cookbook/form/data_transformers.rst
index dcaad7a2461..a734ddfa9c5 100644
--- a/cookbook/form/data_transformers.rst
+++ b/cookbook/form/data_transformers.rst
@@ -161,17 +161,17 @@ to and from the issue number and the ``Issue`` object::
     namespace AppBundle\Form\DataTransformer;
 
     use AppBundle\Entity\Issue;
-    use Doctrine\ORM\EntityManager;
+    use Doctrine\Common\Persistence\ObjectManager;
     use Symfony\Component\Form\DataTransformerInterface;
     use Symfony\Component\Form\Exception\TransformationFailedException;
 
     class IssueToNumberTransformer implements DataTransformerInterface
     {
-        private $entityManager;
+        private $manager;
 
-        public function __construct(EntityManager $entityManager)
+        public function __construct(ObjectManager $manager)
         {
-            $this->entityManager = $entityManager;
+            $this->manager = $manager;
         }
 
         /**
@@ -203,7 +203,7 @@ to and from the issue number and the ``Issue`` object::
                 return;
             }
 
-            $issue = $this->entityManager
+            $issue = $this->manager
                 ->getRepository('AppBundle:Issue')
                 // query for the issue with this id
                 ->find($issueNumber)
@@ -253,16 +253,16 @@ to be passed in. Then, you can easily create and add the transformer::
     namespace AppBundle\Form\Type;
 
     use AppBundle\Form\DataTransformer\IssueToNumberTransformer;
-    use Doctrine\Common\Persistence\EntityManager;
+    use Doctrine\Common\Persistence\ObjectManager;
 
     // ...
     class TaskType extends AbstractType
     {
-        private $entityManager;
+        private $manager;
 
-        public function __construct(EntityManager $entityManager)
+        public function __construct(ObjectManager $manager)
         {
-            $this->entityManager = $entityManager;
+            $this->manager = $manager;
         }
 
         public function buildForm(FormBuilderInterface $builder, array $options)
@@ -277,7 +277,7 @@ to be passed in. Then, you can easily create and add the transformer::
             // ...
 
             $builder->get('issue')
-                ->addModelTransformer(new IssueToNumberTransformer($this->entityManager));
+                ->addModelTransformer(new IssueToNumberTransformer($this->manager));
         }
 
         // ...
@@ -286,8 +286,8 @@ to be passed in. Then, you can easily create and add the transformer::
 Now, when you create your ``TaskType``, you'll need to pass in the entity manager::
 
     // e.g. in a controller somewhere
-    $entityManager = $this->getDoctrine()->getManager();
-    $form = $this->createForm(new TaskType($entityManager), $task);
+    $manager = $this->getDoctrine()->getManager();
+    $form = $this->createForm(new TaskType($manager), $task);
 
     // ...
 
@@ -331,23 +331,23 @@ First, create the custom field type class::
     namespace AppBundle\Form;
 
     use AppBundle\Form\DataTransformer\IssueToNumberTransformer;
-    use Doctrine\ORM\EntityManager;
+    use Doctrine\Common\Persistence\ObjectManager;
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
     use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
     class IssueSelectorType extends AbstractType
     {
-        private $entityManager;
+        private $manager;
 
-        public function __construct(EntityManager $entityManager)
+        public function __construct(ObjectManager $manager)
         {
-            $this->entityManager = $entityManager;
+            $this->manager = $manager;
         }
 
         public function buildForm(FormBuilderInterface $builder, array $options)
         {
-            $transformer = new IssueToNumberTransformer($this->entityManager);
+            $transformer = new IssueToNumberTransformer($this->manager);
             $builder->addModelTransformer($transformer);
         }