ISSUE-345

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   main:
     name: phpList on PHP ${{ matrix.php-versions }} [Build, Test]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       DB_DATABASE: phplist
       DB_USERNAME: root

.github/workflows/core-docs.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   make-restapi-docs:
     name: Checkout phpList core and generate docs using `phpDocumentor`
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -41,7 +41,7 @@ jobs:
           path: phpdocumentor.zip
   deploy-docs:
     name: Deploy Core Docs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: make-restapi-docs
     steps:
       - name: Checkout phplist/core-docs

config/repositories.yml

@@ -11,10 +11,10 @@ services:
         arguments:
             - PhpList\Core\Domain\Model\Identity\AdministratorToken
 
-    PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository:
+    PhpList\Core\Domain\Repository\Subscription\SubscriberListRepository:
         parent: PhpList\Core\Domain\Repository
         arguments:
-            - PhpList\Core\Domain\Model\Messaging\SubscriberList
+            - PhpList\Core\Domain\Model\Subscription\SubscriberList
 
     PhpList\Core\Domain\Repository\Subscription\SubscriberRepository:
         parent: PhpList\Core\Domain\Repository
@@ -25,3 +25,18 @@ services:
         parent: PhpList\Core\Domain\Repository
         arguments:
             - PhpList\Core\Domain\Model\Subscription\Subscription
+
+    PhpList\Core\Domain\Repository\Messaging\MessageRepository:
+        parent: PhpList\Core\Domain\Repository
+        arguments:
+            - PhpList\Core\Domain\Model\Messaging\Message
+
+    PhpList\Core\Domain\Repository\Messaging\TemplateRepository:
+        parent: PhpList\Core\Domain\Repository
+        arguments:
+            - PhpList\Core\Domain\Model\Messaging\Template
+
+    PhpList\Core\Domain\Repository\Messaging\TemplateImageRepository:
+        parent: PhpList\Core\Domain\Repository
+        arguments:
+            - PhpList\Core\Domain\Model\Messaging\TemplateImage

src/Domain/Model/Analytics/LinkTrackForward.php

@@ -7,8 +7,8 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
 use PhpList\Core\Domain\Repository\Analytics\LinkTrackForwardRepository;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity(repositoryClass: LinkTrackForwardRepository::class)]
 #[ORM\Table(name: 'phplist_linktrack_forward')]
@@ -17,7 +17,11 @@
 #[ORM\Index(name: 'uuididx', columns: ['uuid'])]
 class LinkTrackForward implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(type: 'string', length: 2083, nullable: true)]
     private ?string $url = null;
@@ -31,6 +35,11 @@ class LinkTrackForward implements DomainModel, Identity
     #[ORM\Column(type: 'boolean', nullable: true, options: ['default' => 0])]
     private bool $personalise = false;
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
     public function getUrl(): ?string
     {
         return $this->url;

src/Domain/Model/Analytics/LinkTrackUmlClick.php

@@ -8,8 +8,8 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
 use PhpList\Core\Domain\Repository\Analytics\LinkTrackUmlClickRepository;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity(repositoryClass: LinkTrackUmlClickRepository::class)]
 #[ORM\Table(name: 'phplist_linktrack_uml_click')]
@@ -19,7 +19,11 @@
 #[ORM\Index(name: 'uidindex', columns: ['userid'])]
 class LinkTrackUmlClick implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(name: 'messageid', type: 'integer')]
     private int $messageId;
@@ -45,6 +49,11 @@ class LinkTrackUmlClick implements DomainModel, Identity
     #[ORM\Column(name: 'textclicked', type: 'integer', nullable: true, options: ['default' => 0])]
     private ?int $textClicked = 0;
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
     public function getMessageId(): int
     {
         return $this->messageId;

src/Domain/Model/Analytics/UserMessageView.php

@@ -8,7 +8,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'phplist_user_message_view')]
@@ -17,7 +17,11 @@
 #[ORM\Index(name: 'usermsgidx', columns: ['userid', 'messageid'])]
 class UserMessageView implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(name: 'messageid', type: 'integer')]
     private int $messageId;
@@ -34,6 +38,11 @@ class UserMessageView implements DomainModel, Identity
     #[ORM\Column(name: 'data', type: 'text', nullable: true)]
     private ?string $data = null;
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
     public function getMessageId(): int
     {
         return $this->messageId;

src/Domain/Model/Analytics/UserStats.php

@@ -7,7 +7,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'phplist_userstats')]
@@ -18,7 +18,11 @@
 #[ORM\Index(name: 'listindex', columns: ['listid'])]
 class UserStats implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(name: 'unixdate', type: 'integer', nullable: true)]
     private ?int $unixDate = null;
@@ -32,6 +36,11 @@ class UserStats implements DomainModel, Identity
     #[ORM\Column(name: 'value', type: 'integer', options: ['default' => 0])]
     private int $value = 0;
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
     public function getUnixDate(): ?int
     {
         return $this->unixDate;

src/Domain/Model/Configuration/EventLog.php

@@ -8,16 +8,20 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
 use PhpList\Core\Domain\Repository\Configuration\EventLogRepository;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity(repositoryClass: EventLogRepository::class)]
 #[ORM\Table(name: 'phplist_eventlog')]
 #[ORM\Index(name: 'enteredidx', columns: ['entered'])]
 #[ORM\Index(name: 'pageidx', columns: ['page'])]
 class EventLog implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(type: 'datetime', nullable: true)]
     private ?DateTimeInterface $entered = null;
@@ -28,7 +32,7 @@ class EventLog implements DomainModel, Identity
     #[ORM\Column(type: 'text', nullable: true)]
     private ?string $entry = null;
 
-    public function getId(): int
+    public function getId(): ?int
     {
         return $this->id;
     }

src/Domain/Model/Configuration/UrlCache.php

@@ -8,14 +8,18 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'phplist_urlcache')]
 #[ORM\Index(name: 'urlindex', columns: ['url'])]
 class UrlCache implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(name: 'url', type: 'string', length: 2083)]
     private string $url;
@@ -29,6 +33,11 @@ class UrlCache implements DomainModel, Identity
     #[ORM\Column(name: 'content', type: 'blob', nullable: true)]
     private ?string $content = null;
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
     public function getUrl(): string
     {
         return $this->url;

src/Domain/Model/Identity/AdminAttribute.php

@@ -7,15 +7,19 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
 use PhpList\Core\Domain\Repository\Identity\AdminAttributeRepository;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity(repositoryClass: AdminAttributeRepository::class)]
 #[ORM\Table(name: 'phplist_admin_attribute')]
 #[ORM\HasLifecycleCallbacks]
 class AdminAttribute implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(name: 'name', type: 'string', length: 255)]
     private string $name;
@@ -51,7 +55,7 @@ public function __construct(
         $this->tableName = $tableName;
     }
 
-    public function getId(): int
+    public function getId(): ?int
     {
         return $this->id;
     }
@@ -86,33 +90,45 @@ public function getTableName(): ?string
         return $this->tableName;
     }
 
-    public function setName(string $name): void
+    public function setName(string $name): self
     {
         $this->name = $name;
+
+        return $this;
     }
 
-    public function setType(?string $type): void
+    public function setType(?string $type): self
     {
         $this->type = $type;
+
+        return $this;
     }
 
-    public function setListOrder(?int $listOrder): void
+    public function setListOrder(?int $listOrder): self
     {
         $this->listOrder = $listOrder;
+
+        return $this;
     }
 
-    public function setDefaultValue(?string $defaultValue): void
+    public function setDefaultValue(?string $defaultValue): self
     {
         $this->defaultValue = $defaultValue;
+
+        return $this;
     }
 
-    public function setRequired(?bool $required): void
+    public function setRequired(?bool $required): self
     {
         $this->required = $required;
+
+        return $this;
     }
 
-    public function setTableName(?string $tableName): void
+    public function setTableName(?string $tableName): self
     {
         $this->tableName = $tableName;
+
+        return $this;
     }
 }

src/Domain/Model/Identity/AdminAttributeRelation.php

@@ -46,8 +46,10 @@ public function getValue(): ?string
         return $this->value;
     }
 
-    public function setValue(?string $value): void
+    public function setValue(?string $value): self
     {
         $this->value = $value;
+
+        return $this;
     }
 }

src/Domain/Model/Identity/AdminLogin.php

@@ -7,15 +7,19 @@
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Model\Interfaces\Identity;
-use PhpList\Core\Domain\Model\Traits\IdentityTrait;
 use PhpList\Core\Domain\Repository\Identity\AdminLoginRepository;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity(repositoryClass: AdminLoginRepository::class)]
 #[ORM\Table(name: 'phplist_admin_login')]
 #[ORM\HasLifecycleCallbacks]
 class AdminLogin implements DomainModel, Identity
 {
-    use IdentityTrait;
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
+    #[Groups(['SubscriberList', 'SubscriberListMembers'])]
+    private ?int $id = null;
 
     #[ORM\Column(name: 'adminid', type: 'integer', options: ['unsigned' => true])]
     private int $adminId;
@@ -49,6 +53,11 @@ public function __construct(
         $this->sessionId = $sessionId;
     }
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
     public function setActive(bool $active): self
     {
         $this->active = $active;