WIP: SF5 Compatibility, Drop FOS USER

BadPixxel · Apr 24, 2023 · d347748 · d347748
1 parent 6b03b7e
commit d347748
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 4 deletions.
diff --git a/src/Models/Gdpr/GdprEntityTrait.php b/src/Models/Gdpr/GdprEntityTrait.php
diff --git a/src/Models/Managers/EmailsUpdaterTrait.php b/src/Models/Managers/EmailsUpdaterTrait.php
diff --git a/src/Models/Managers/ErrorLoggerTrait.php b/src/Models/Managers/ErrorLoggerTrait.php
diff --git a/src/Models/Managers/SmsStorageTrait.php b/src/Models/Managers/SmsStorageTrait.php
@@ -16,9 +16,9 @@
 use BadPixxel\SendinblueBridge\Helpers\SmsExtractor;
 use BadPixxel\SendinblueBridge\Repository\SmsRepository;
 use Doctrine\ORM\EntityManagerInterface as EntityManager;
-use FOS\UserBundle\Model\UserInterface as User;
 use SendinBlue\Client\Model\SendSms;
 use SendinBlue\Client\Model\SendTransacSms;
+use Sonata\UserBundle\Model\UserInterface as User;
 
 /**
  * Manage Storage of User Sms in Database.
@@ -28,7 +28,26 @@ trait SmsStorageTrait
     /**
      * @var EntityManager
      */
-    private $entityManager;
+    private EntityManager $entityManager;
+
+    /**
+     * Find a User by Email
+     *
+     * @param string $userEmail
+     *
+     * @return null|User
+     */
+    public function getUserByEmail(string $userEmail): ?User
+    {
+        $repository = $this->entityManager
+            ->getRepository($this->config->getUserStorageClass())
+        ;
+        $user = $repository->findOneBy(array(
+            "email" => $userEmail
+        ));
+
+        return ($user instanceof User) ? $user : null;
+    }
 
     /**
      * Setup Entity Manager for Storage

diff --git a/src/Models/Managers/StorageTrait.php b/src/Models/Managers/StorageTrait.php
@@ -17,9 +17,9 @@
 use BadPixxel\SendinblueBridge\Helpers\EmailExtractor;
 use BadPixxel\SendinblueBridge\Repository\EmailRepository;
 use Doctrine\ORM\EntityManagerInterface as EntityManager;
-use FOS\UserBundle\Model\UserInterface as User;
 use SendinBlue\Client\Model\CreateSmtpEmail;
 use SendinBlue\Client\Model\SendSmtpEmail;
+use Sonata\UserBundle\Model\UserInterface as User;
 
 /**
  * Manage Storage of User Emails in Database.
@@ -29,7 +29,26 @@ trait StorageTrait
     /**
      * @var EntityManager
      */
-    private $entityManager;
+    private EntityManager $entityManager;
+
+    /**
+     * Find a User by Email
+     *
+     * @param string $userEmail
+     *
+     * @return null|User
+     */
+    public function getUserByEmail(string $userEmail): ?User
+    {
+        $repository = $this->entityManager
+            ->getRepository($this->config->getUserStorageClass())
+        ;
+        $user = $repository->findOneBy(array(
+            "email" => $userEmail
+        ));
+
+        return ($user instanceof User) ? $user : null;
+    }
 
     /**
      * Search for Send Email by Message Id

diff --git a/src/Models/Managers/TemplatingTrait.php b/src/Models/Managers/TemplatingTrait.php
diff --git a/src/Models/Managers/UserFinderTrait.php b/src/Models/Managers/UserFinderTrait.php
diff --git a/src/Models/Templating/HtmlTemplateTrait.php b/src/Models/Templating/HtmlTemplateTrait.php
diff --git a/src/Models/Templating/MjmlTemplateTrait.php b/src/Models/Templating/MjmlTemplateTrait.php