[make:entity] _em will be private in ORM 3.0

Author: jrushlow

src/Resources/skeleton/doctrine/Repository.tpl.php

@@ -19,27 +19,21 @@ public function __construct(ManagerRegistry $registry)
         parent::__construct($registry, <?= $entity_class_name; ?>::class);
     }
 
-    /**
-     * @throws ORMException
-     * @throws OptimisticLockException
-     */
     public function add(<?= $entity_class_name ?> $entity, bool $flush = false): void
     {
-        $this->_em->persist($entity);
+        ($em = $this->getEntityManager())->persist($entity);
+
         if ($flush) {
-            $this->_em->flush();
+            $em->flush();
         }
     }
 
-    /**
-     * @throws ORMException
-     * @throws OptimisticLockException
-     */
     public function remove(<?= $entity_class_name ?> $entity, bool $flush = false): void
     {
-        $this->_em->remove($entity);
+        ($em = $this->getEntityManager())->remove($entity);
+
         if ($flush) {
-            $this->_em->flush();
+            $em->flush();
         }
     }
 <?php if ($include_example_comments): // When adding a new method without existing default comments, the blank line is automatically added.?>
@@ -56,8 +50,8 @@ public function upgradePassword(<?= sprintf('%s ', $password_upgrade_user_interf
         }
 
         $user->setPassword($newHashedPassword);
-        $this->_em->persist($user);
-        $this->_em->flush();
+
+        $this->add($user, true);
     }
 
 <?php endif ?>