Fix mapping

Author: tatevikg1

src/Bounce/Service/SubscriberBlacklistService.php

@@ -40,7 +40,7 @@ public function blacklist(Subscriber $subscriber, string $reason): void
     {
         $subscriber->setBlacklisted(true);
         $this->entityManager->flush();
-        $this->blacklistManager->addEmailToBlacklist($subscriber->getEmail(), $reason);
+        $userBlacklist = $this->blacklistManager->addEmailToBlacklist($subscriber->getEmail(), $reason);
         $this->entityManager->flush();
 
         foreach (['REMOTE_ADDR','HTTP_X_FORWARDED_FOR'] as $item) {
@@ -50,7 +50,7 @@ public function blacklist(Subscriber $subscriber, string $reason): void
             }
             if ($request->server->get($item)) {
                 $this->blacklistManager->addBlacklistData(
-                    email: $subscriber->getEmail(),
+                    userBlacklist: $userBlacklist,
                     name: $item,
                     data: $request->server->get($item)
                 );

src/Core/Doctrine/OnlyOrmTablesFilter.php

@@ -11,21 +11,22 @@ class OnlyOrmTablesFilter
     /** @var string[]|null */
     private ?array $allow = null;
 
-    public function __construct(private readonly EntityManagerInterface $em)
+    public function __construct(private readonly EntityManagerInterface $entityManager)
     {
     }
 
     public function __invoke(string $assetName): bool
     {
         // asset names can be "schema.table" ➜ normalize
-        if (false !== ($pos = strrpos($assetName, '.'))) {
+        $pos = strrpos($assetName, '.');
+        if ($pos !== false) {
             $assetName = substr($assetName, $pos + 1);
         }
 
         // Build the whitelist lazily to avoid touching the EM during container compilation or early boot.
         if ($this->allow === null) {
             $names = [];
-            foreach ($this->em->getMetadataFactory()->getAllMetadata() as $m) {
+            foreach ($this->entityManager->getMetadataFactory()->getAllMetadata() as $m) {
                 // main table
                 $table = $m->getTableName();
                 if ($table) {

src/Domain/Analytics/Model/LinkTrack.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Analytics\Model;
 
+use DateTime;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Analytics\Repository\LinkTrackRepository;
@@ -39,12 +40,17 @@ class LinkTrack implements DomainModel, Identity
     #[ORM\Column(name: 'firstclick', type: 'datetime', nullable: true)]
     private ?DateTimeInterface $firstClick = null;
 
-    #[ORM\Column(name: 'latestclick', type: 'datetime', nullable: true, options: ['default' => 'CURRENT_TIMESTAMP'])]
+    #[ORM\Column(name: 'latestclick', type: 'datetime')]
     private ?DateTimeInterface $latestClick = null;
 
     #[ORM\Column(type: 'integer', nullable: true, options: ['default' => 0])]
     private int $clicked = 0;
 
+    public function __construct()
+    {
+        $this->latestClick = new DateTime();
+    }
+
     public function getId(): int
     {
         return $this->id;

src/Domain/Analytics/Model/UserStats.php

@@ -29,11 +29,11 @@ class UserStats implements DomainModel, Identity
     #[ORM\Column(name: 'item', type: 'string', length: 255, nullable: true)]
     private ?string $item = null;
 
-    #[ORM\Column(name: 'listid', type: 'integer', options: ['default' => 0])]
+    #[ORM\Column(name: 'listid', type: 'integer', nullable: true, options: ['default' => 0])]
     private int $listId = 0;
 
-    #[ORM\Column(name: 'value', type: 'integer', nullable: false)]
-    private int $value;
+    #[ORM\Column(name: 'value', type: 'integer', nullable: true, options: ['default' => 0])]
+    private ?int $value = null;
 
     public function getId(): ?int
     {

src/Domain/Configuration/Model/EventLog.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Configuration\Model;
 
+use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Common\Model\Interfaces\DomainModel;
@@ -14,6 +15,7 @@
 #[ORM\Table(name: 'phplist_eventlog')]
 #[ORM\Index(name: 'enteredidx', columns: ['entered'])]
 #[ORM\Index(name: 'pageidx', columns: ['page'])]
+#[ORM\HasLifecycleCallbacks]
 class EventLog implements DomainModel, Identity
 {
     #[ORM\Id]
@@ -35,6 +37,13 @@ public function getId(): ?int
         return $this->id;
     }
 
+    #[ORM\PrePersist]
+    public function setCreatedTimestamps(): void
+    {
+        $now = new DateTimeImmutable();
+        $this->entered = $now;
+    }
+
     public function getEntered(): ?DateTimeInterface
     {
         return $this->entered;

src/Domain/Configuration/Model/UrlCache.php

@@ -13,6 +13,7 @@
 #[ORM\Entity(repositoryClass: UrlCacheRepository::class)]
 #[ORM\Table(name: 'phplist_urlcache')]
 #[ORM\Index(name: 'urlindex', columns: ['url'])]
+#[ORM\HasLifecycleCallbacks]
 class UrlCache implements DomainModel, Identity
 {
     #[ORM\Id]
@@ -71,10 +72,11 @@ public function setLastModified(?int $lastModified): self
         return $this;
     }
 
-    public function setAdded(?DateTime $added): self
+    #[ORM\PrePersist]
+    public function setCreatedTimestamps(): void
     {
-        $this->added = $added;
-        return $this;
+        $now = new DateTime();
+        $this->added = $now;
     }
 
     public function setContent(?string $content): self

src/Domain/Identity/Model/AdminLogin.php

@@ -37,7 +37,7 @@ class AdminLogin implements DomainModel, Identity
     #[ORM\Column(name: 'sessionid', type: 'string', length: 50)]
     private string $sessionId;
 
-    #[ORM\Column(name: 'active', type: 'boolean')]
+    #[ORM\Column(name: 'active', type: 'boolean', nullable: false)]
     private bool $active = false;
 
     public function __construct(

src/Domain/Identity/Model/AdminPasswordRequest.php

@@ -12,7 +12,6 @@
 
 #[ORM\Entity(repositoryClass: AdminPasswordRequestRepository::class)]
 #[ORM\Table(name: 'phplist_admin_password_request')]
-#[ORM\HasLifecycleCallbacks]
 class AdminPasswordRequest implements DomainModel, Identity
 {
     #[ORM\Id]

src/Domain/Identity/Model/Administrator.php

@@ -22,10 +22,8 @@
  * @author Tatevik Grigoryan <[email protected]>
  */
 #[ORM\Entity(repositoryClass: AdministratorRepository::class)]
-#[ORM\Table(
-    name: 'phplist_admin',
-    uniqueConstraints: [new ORM\UniqueConstraint(name: 'loginnameidx', columns: ['loginname'])]
-)]
+#[ORM\Table(name: 'phplist_admin')]
+#[ORM\UniqueConstraint(name: 'loginnameidx', columns: ['loginname'])]
 #[ORM\HasLifecycleCallbacks]
 class Administrator implements DomainModel, Identity, CreationDate, ModificationDate
 {
@@ -35,7 +33,7 @@ class Administrator implements DomainModel, Identity, CreationDate, Modification
     private ?int $id = null;
 
     #[ORM\Column(name: 'created', type: 'datetime', nullable: true)]
-    protected ?DateTime $createdAt = null;
+    protected DateTime $createdAt;
 
     #[ORM\Column(name: 'modified', type: 'datetime', nullable: false)]
     private DateTime $updatedAt;
@@ -71,7 +69,6 @@ public function __construct()
     {
         $this->createdAt = new DateTime();
         $this->updatedAt = new DateTime();
-        $this->loginName = '';
         $this->email = '';
     }
 
@@ -80,7 +77,7 @@ public function getId(): ?int
         return $this->id;
     }
 
-    public function getCreatedAt(): ?DateTime
+    public function getCreatedAt(): DateTime
     {
         return $this->createdAt;
     }
@@ -170,6 +167,8 @@ public function setPrivileges(Privileges $privileges): self
 
     /**
      * @throws InvalidArgumentException
+     *
+     * @SuppressWarnings(PHPMD.StaticAccess)
      */
     public function setPrivilegesFromArray(array $privilegesData): void
     {
@@ -184,6 +183,7 @@ public function setPrivilegesFromArray(array $privilegesData): void
         $this->setPrivileges($privileges);
     }
 
+    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function getPrivileges(): Privileges
     {
         return Privileges::fromSerialized($this->privileges);
@@ -209,17 +209,8 @@ public function owns(OwnableInterface $resource): bool
         return $resource->getOwner()->getId() === $this->getId();
     }
 
-    #[ORM\PrePersist]
-    public function onPrePersist(): void
-    {
-        if ($this->createdAt === null) {
-            $this->createdAt = new DateTime();
-        }
-        $this->updatedAt = new DateTime();
-    }
-
     #[ORM\PreUpdate]
-    public function onPreUpdate(): void
+    public function setUpdatedAt(): void
     {
         $this->updatedAt = new DateTime();
     }

src/Domain/Identity/Model/AdministratorToken.php

@@ -44,11 +44,13 @@ class AdministratorToken implements DomainModel, Identity, CreationDate
 
     #[ORM\ManyToOne(targetEntity: Administrator::class)]
     #[ORM\JoinColumn(name: 'adminid', referencedColumnName: 'id', onDelete: 'CASCADE')]
-    private ?Administrator $administrator = null;
+    private Administrator $administrator;
 
-    public function __construct()
+    public function __construct(Administrator $administrator)
     {
-        $this->setExpiry(new DateTime());
+        $this->generateExpiry();
+        $this->generateKey();
+        $this->administrator = $administrator;
     }
 
     public function getId(): ?int
@@ -112,7 +114,7 @@ public function generateKey(): self
         return $this;
     }
 
-    public function getAdministrator(): Administrator|Proxy|null
+    public function getAdministrator(): Administrator|Proxy
     {
         return $this->administrator;
     }