From f6d8df4d08d90c1b255217e3aac8bc8a725cbc8e Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Tue, 26 Mar 2019 16:26:19 +0100
Subject: [PATCH] =?UTF-8?q?UserMapper=20n'a=20pas=20besoin=20d'h=C3=A9rite?=
 =?UTF-8?q?r=20de=20\ZfcUser\Mapper\User.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UnicaenAuth/Service/UserMapper.php | 30 +++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/UnicaenAuth/Service/UserMapper.php b/src/UnicaenAuth/Service/UserMapper.php
index 52522ec..efa8c91 100644
--- a/src/UnicaenAuth/Service/UserMapper.php
+++ b/src/UnicaenAuth/Service/UserMapper.php
@@ -5,9 +5,10 @@ namespace UnicaenAuth\Service;
 use Doctrine\ORM\EntityManagerInterface;
 use UnicaenAuth\Entity\Db\AbstractUser;
 use UnicaenAuth\Options\ModuleOptions;
-use Zend\Hydrator\HydratorInterface;
+use ZfcUser\Entity\UserInterface as UserEntityInterface;
+use ZfcUser\Mapper\UserInterface;
 
-class UserMapper extends \ZfcUser\Mapper\User
+class UserMapper implements UserInterface
 {
     //========== repris du module zf-commons/zfc-user-doctrine-orm abandonné =========
     /**
@@ -20,12 +21,21 @@ class UserMapper extends \ZfcUser\Mapper\User
      */
     protected $options;
 
+    /**
+     * UserMapper constructor.
+     *
+     * @param EntityManagerInterface $em
+     * @param ModuleOptions          $options
+     */
     public function __construct(EntityManagerInterface $em, ModuleOptions $options)
     {
         $this->em      = $em;
         $this->options = $options;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function findByEmail($email)
     {
         $er = $this->em->getRepository($this->options->getUserEntityClass());
@@ -33,6 +43,9 @@ class UserMapper extends \ZfcUser\Mapper\User
         return $er->findOneBy(array('email' => $email));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function findByUsername($username)
     {
         $er = $this->em->getRepository($this->options->getUserEntityClass());
@@ -40,6 +53,9 @@ class UserMapper extends \ZfcUser\Mapper\User
         return $er->findOneBy(array('username' => $username));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function findById($id)
     {
         $er = $this->em->getRepository($this->options->getUserEntityClass());
@@ -50,7 +66,7 @@ class UserMapper extends \ZfcUser\Mapper\User
     /**
      * {@inheritdoc}
      */
-    public function insert($entity, $tableName = null, HydratorInterface $hydrator = null)
+    public function insert(UserEntityInterface $entity)
     {
         return $this->persist($entity);
     }
@@ -58,12 +74,16 @@ class UserMapper extends \ZfcUser\Mapper\User
     /**
      * {@inheritdoc}
      */
-    public function update($entity, $where = null, $tableName = null, HydratorInterface $hydrator = null)
+    public function update(UserEntityInterface $entity)
     {
         return $this->persist($entity);
     }
 
-    protected function persist($entity)
+    /**
+     * @param UserEntityInterface $entity
+     * @return mixed
+     */
+    protected function persist(UserEntityInterface $entity)
     {
         $this->em->persist($entity);
         $this->em->flush();
-- 
GitLab