WIP: SF5 Compatibility, Drop FOS USER

BadPixxel · Apr 26, 2023 · 56138ab · 56138ab
1 parent 31eea67
commit 56138ab
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 39 deletions.
diff --git a/src/Models/UserEmails/ContentsTrait.php b/src/Models/UserEmails/ContentsTrait.php
@@ -31,70 +31,71 @@ trait ContentsTrait
      *
      * @ORM\Column(name="email", type="string", length=255, nullable=false)
      */
-    private $email;
+    protected string $email;
 
     /**
      * @var string
      *
      * @ORM\Column(name="md5", type="string", length=255, nullable=false)
      */
-    private $md5;
+    protected string $md5;
 
     /**
      * @var string
      *
      * @ORM\Column(name="message_id", type="string", length=255, nullable=false)
      */
-    private $messageId;
+    protected string $messageId;
 
     /**
      * @var null|string
      *
      * @ORM\Column(name="uuid", type="string", length=255, nullable=true)
      */
-    private $uuid;
+    protected ?string $uuid = null;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subject", type="string", length=512, nullable=false)
      */
-    private $subject;
+    protected string $subject;
 
     /**
      * @var null|string
      *
      * @ORM\Column(name="html", type="text", nullable=true)
      */
-    private $htmlContent;
+    protected ?string $htmlContent = null;
 
     /**
      * @var null|string
      *
      * @ORM\Column(name="text", type="text", nullable=true)
      */
-    private $textContent;
+    protected ?string $textContent = null;
 
     /**
      * @var null|int
      *
      * @ORM\Column(name="template_id", type="integer", nullable=true)
      */
-    private $templateId;
+    protected ?int $templateId = null;
 
     /**
      * @var null|array
      *
      * @ORM\Column(name="parameters", type="array", nullable=true)
      */
-    private $parameters;
+    protected ?array $parameters = null;
 
     //==============================================================================
     // MAIN FUNCTIONS
     //==============================================================================
 
     /**
-     * @param string $htmlContent
+     * @param string      $uuid
+     * @param null|string $htmlContent
      *
      * @return $this
      */
@@ -183,7 +184,7 @@ public function getParameters(): ?array
     }
 
     /**
-     * @param string $htmlContent
+     * @param null|string $htmlContent
      *
      * @return $this
      */
@@ -255,7 +256,7 @@ protected function setSubject(string $subject): self
     }
 
     /**
-     * @param string $textContent
+     * @param null|string $textContent
      *
      * @return $this
      */
@@ -267,7 +268,7 @@ protected function setTextContent(?string $textContent): self
     }
 
     /**
-     * @param int $templateId
+     * @param null|int $templateId
      *
      * @return $this
      */
@@ -279,7 +280,7 @@ protected function setTemplateId(?int $templateId): self
     }
 
     /**
-     * @param array $parameters
+     * @param null|array $parameters
      *
      * @return $this
      */

diff --git a/src/Models/UserEmails/MetadataTrait.php b/src/Models/UserEmails/MetadataTrait.php
@@ -15,6 +15,7 @@
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
+use Exception;
 use SendinBlue\Client\Model\GetEmailEventReportEvents;
 use SendinBlue\Client\Model\GetEmailEventReportEvents as Event;
 
@@ -23,25 +24,6 @@
  */
 trait MetadataTrait
 {
-    /**
-     * @var array
-     */
-    private static $eventSuccess = array(
-        Event::EVENT_DELIVERED,
-        Event::EVENT_OPENED,
-        Event::EVENT_CLICKS,
-    );
-
-    /**
-     * @var array
-     */
-    private static $eventDanger = array(
-        Event::EVENT_SPAM,
-        Event::EVENT_INVALID,
-        Event::EVENT_BLOCKED,
-        //        Event::EVENT_UNSUBSCRIBED
-    );
-
     //==============================================================================
     // DEFINITION DE DONNEES
     //==============================================================================
@@ -53,7 +35,7 @@ trait MetadataTrait
      *
      * @ORM\Column(name="send_at", type="datetime", nullable=true)
      */
-    private $sendAt;
+    protected ?DateTime $sendAt = null;
 
     /**
      * Date of First Opening.
@@ -62,7 +44,7 @@ trait MetadataTrait
      *
      * @ORM\Column(name="open_at", type="datetime", nullable=true)
      */
-    private $openAt;
+    protected ?DateTime $openAt = null;
 
     /**
      * Date of last Events Refresh.
@@ -71,14 +53,32 @@ trait MetadataTrait
      *
      * @ORM\Column(name="refreshed_at", type="datetime", nullable=true)
      */
-    private $refreshedAt;
+    protected ?DateTime $refreshedAt = null;
+    /**
+     * @var array
+     */
+    private static array $eventSuccess = array(
+        Event::EVENT_DELIVERED,
+        Event::EVENT_OPENED,
+        Event::EVENT_CLICKS,
+    );
+
+    /**
+     * @var array
+     */
+    private static array $eventDanger = array(
+        Event::EVENT_SPAM,
+        Event::EVENT_INVALID,
+        Event::EVENT_BLOCKED,
+        //        Event::EVENT_UNSUBSCRIBED
+    );
 
     /**
      * @var null|GetEmailEventReportEvents[]
      *
      * @ORM\Column(name="events", type="array", nullable=true)
      */
-    private $events;
+    private ?array $events = null;
 
     //==============================================================================
     // MAIN FUNCTIONS
@@ -122,6 +122,8 @@ public function isEventOutdated(): bool
     /**
      * @param array $events
      *
+     * @throws Exception
+     *
      * @return $this
      */
     public function setEvents(array $events): self
@@ -136,7 +138,7 @@ public function setEvents(array $events): self
             /** @var GetEmailEventReportEvents $event */
             foreach ($events as $event) {
                 if (Event::EVENT_OPENED == $event->getEvent()) {
-                    $this->setOpenAt(new \DateTime($event->getDate()));
+                    $this->setOpenAt(new DateTime($event->getDate()));
 
                     break;
                 }

diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
@@ -13,7 +13,7 @@ services:
     # AutoWire for Controllers
     BadPixxel\SendinblueBridge\Controller\:
         resource: '../../Controller'
-        tags: ['controller.service_arguments']
+        tags: ['controller.service_arguments', 'container.service_subscriber']
 
     ################################################################################
     # Bridge Configurations Manager