ISSUE-337: use symfony 6.4

Author: tatevikg1

composer.json

@@ -38,25 +38,24 @@
         "doctrine/orm": "^2.11",
         "doctrine/common": "^3.3",
         "doctrine/doctrine-bundle": "^2.7",
-        "symfony/symfony": "^4.4|^5.4",
-        "symfony/monolog-bundle": "^3.8|^4.0",
-        "symfony/dependency-injection": "^4.4|^5.4",
-        "symfony/config": "^4.4|^5.4",
-        "symfony/yaml": "^4.4|^5.4",
+        "symfony/symfony": "^6.4",
+        "symfony/dependency-injection": "^6.4",
+        "symfony/config": "^6.4",
+        "symfony/yaml": "^6.4",
         "doctrine/annotations": "*",
         "symfony/error-handler": "*",
         "symfony/serializer": "*",
-        "monolog/monolog": "^2.0"
+        "symfony/monolog-bundle": "^3.10",
+        "symfony/serializer-pack": "^1.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.2",
         "guzzlehttp/guzzle": "^6.3.0",
         "squizlabs/php_codesniffer": "^3.2.0",
-        "phpstan/phpstan": "^0.7.0|0.12.57",
-        "nette/caching": "^2.5.0|^3.0.0",
+        "phpstan/phpstan": "^0.12.57",
+        "nette/caching": "^3.0.0",
         "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
-        "composer/composer": "^1.6.0",
         "doctrine/instantiator": "^1.0.5",
         "doctrine/doctrine-fixtures-bundle": "^3.6"
     },
@@ -115,7 +114,7 @@
             "routes": {
                 "homepage": {
                     "resource": "@EmptyStartPageBundle/Controller/",
-                    "type": "annotation"
+                    "type": "attribute"
                 }
             }
         }

config/config.yml

@@ -33,6 +33,7 @@ framework:
         log: true
     serializer:
         enabled: true
+        enable_attributes: true
 
 # Doctrine Configuration
 doctrine:

src/Domain/Model/Messaging/SubscriberList.php

@@ -18,6 +18,8 @@
 use PhpList\Core\Domain\Model\Traits\CreationDateTrait;
 use PhpList\Core\Domain\Model\Traits\IdentityTrait;
 use PhpList\Core\Domain\Model\Traits\ModificationDateTrait;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\MaxDepth;
 
 /**
  * This class represents an administrator who can log to the system, is allowed to administer
@@ -35,14 +37,17 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
 
     #[ORM\Column]
     #[SerializedName("name")]
+    #[Groups(['SubscriberList'])]
     private string $name = '';
 
     #[ORM\Column]
     #[SerializedName("description")]
+    #[Groups(['SubscriberList'])]
     private string $description = '';
 
     #[ORM\Column(name: "entered", type: "datetime", nullable: true)]
     #[SerializedName("creation_date")]
+    #[Groups(['SubscriberList'])]
     protected ?DateTime $creationDate = null;
 
     #[ORM\Column(name: "modified", type: "datetime")]
@@ -51,11 +56,13 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
 
     #[ORM\Column(name: "listorder", type: "integer")]
     #[SerializedName("list_position")]
-    private int $listPosition = 0;
+    #[Groups(['SubscriberList'])]
+    private ?int $listPosition;
 
     #[ORM\Column(name: "prefix")]
     #[SerializedName("subject_prefix")]
-    private string $subjectPrefix = '';
+    #[Groups(['SubscriberList'])]
+    private ?string $subjectPrefix;
 
     #[ORM\Column(name: "active", type: "boolean")]
     #[SerializedName("public")]
@@ -75,6 +82,7 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
         targetEntity: "PhpList\Core\Domain\Model\Subscription\Subscription",
         cascade: ["remove"]
     )]
+    #[MaxDepth(1)]
     private Collection $subscriptions;
 
     #[ORM\ManyToMany(
@@ -87,6 +95,7 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
         joinColumns: [new ORM\JoinColumn(name: "listid")],
         inverseJoinColumns: [new ORM\JoinColumn(name: "userid")]
     )]
+    #[MaxDepth(1)]
     private Collection $subscribers;
 
     public function __construct()
@@ -117,7 +126,7 @@ public function setDescription(string $description): void
 
     public function getListPosition(): int
     {
-        return $this->listPosition;
+        return $this->listPosition ?? 0;
     }
 
     public function setListPosition(int $listPosition): void
@@ -127,7 +136,7 @@ public function setListPosition(int $listPosition): void
 
     public function getSubjectPrefix(): string
     {
-        return $this->subjectPrefix;
+        return $this->subjectPrefix ?? '';
     }
 
     public function setSubjectPrefix(string $subjectPrefix): void
@@ -137,7 +146,7 @@ public function setSubjectPrefix(string $subjectPrefix): void
 
     public function isPublic(): bool
     {
-        return $this->public;
+        return $this->public ?? false;
     }
 
     public function setPublic(bool $public): void
@@ -147,7 +156,7 @@ public function setPublic(bool $public): void
 
     public function getCategory(): string
     {
-        return $this->category;
+        return $this->category ?? '';
     }
 
     public function setCategory(string $category): void

src/Domain/Model/Subscription/Subscriber.php

@@ -17,6 +17,7 @@
 use PhpList\Core\Domain\Model\Traits\CreationDateTrait;
 use PhpList\Core\Domain\Model\Traits\IdentityTrait;
 use PhpList\Core\Domain\Model\Traits\ModificationDateTrait;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 /**
  * This class represents subscriber who can subscribe to multiple subscriber lists and can receive email messages from
@@ -34,6 +35,7 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
 
     #[ORM\Column(name: "entered", type: "datetime", nullable: true)]
     #[SerializedName("creation_date")]
+    #[Groups(['SubscriberListMembers'])]
     protected ?DateTime $creationDate = null;
 
     #[ORM\Column(name: "modified", type: "datetime")]
@@ -42,35 +44,42 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
 
     #[ORM\Column(unique: true)]
     #[SerializedName("email")]
+    #[Groups(['SubscriberListMembers'])]
     private string $email = '';
 
     #[ORM\Column(type: "boolean")]
     #[SerializedName("confirmed")]
+    #[Groups(['SubscriberListMembers'])]
     private bool $confirmed = false;
 
     #[ORM\Column(type: "boolean")]
     #[SerializedName("blacklisted")]
+    #[Groups(['SubscriberListMembers'])]
     private bool $blacklisted = false;
 
     #[ORM\Column(name: "bouncecount", type: "integer")]
     #[SerializedName("bounce_count")]
+    #[Groups(['SubscriberListMembers'])]
     private int $bounceCount = 0;
 
     #[ORM\Column(name: "uniqid", unique: true)]
     #[SerializedName("unique_id")]
+    #[Groups(['SubscriberListMembers'])]
     private string $uniqueId = '';
 
     #[ORM\Column(name: "htmlemail", type: "boolean")]
     #[SerializedName("html_email")]
+    #[Groups(['SubscriberListMembers'])]
     private bool $htmlEmail = false;
 
     #[ORM\Column(type: "boolean")]
     #[SerializedName("disabled")]
+    #[Groups(['SubscriberListMembers'])]
     private bool $disabled = false;
 
     #[ORM\Column(name: "extradata", type: "text")]
     #[SerializedName("extra_data")]
-    private string $extraData = '';
+    private ?string $extraData;
 
     #[ORM\OneToMany(
         mappedBy: "subscriber",
@@ -179,7 +188,7 @@ public function setDisabled(bool $disabled): void
 
     public function getExtraData(): string
     {
-        return $this->extraData;
+        return $this->extraData ?? '';
     }
 
     public function setExtraData(string $extraData): void

src/Domain/Model/Traits/IdentityTrait.php

@@ -6,6 +6,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\SerializedName;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 /**
  * This trait provides an ID property to domain models.
@@ -20,6 +21,7 @@ trait IdentityTrait
     #[ORM\Column(type: "integer")]
     #[ORM\GeneratedValue]
     #[SerializedName("id")]
+    #[Groups(['SubscriberList'])]
     private int $id;
 
     public function getId(): int

src/Domain/Repository/Subscription/SubscriberRepository.php

@@ -16,4 +16,19 @@
  */
 class SubscriberRepository extends AbstractRepository
 {
+    /**
+     * Get subscribers by subscribed lists.
+     *
+     * @param int $listId The ID of the subscription list.
+     * @return Subscriber[] Returns an array of Subscriber entities.
+     */
+    public function findSubscribersBySubscribedList(int $listId): array
+    {
+        return $this->createQueryBuilder('s')
+            ->innerJoin('s.subscribedLists', 'l')
+            ->where('l.id = :listId')
+            ->setParameter('listId', $listId)
+            ->getQuery()
+            ->getResult();
+    }
 }

src/EmptyStartPageBundle/Controller/DefaultController.php

@@ -5,7 +5,6 @@
 namespace PhpList\Core\EmptyStartPageBundle\Controller;
 
 use InvalidArgumentException;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -14,14 +13,14 @@
  *
  * @author Oliver Klee <[email protected]>
  */
-class DefaultController extends AbstractController
+class DefaultController
 {
     /**
      * An empty start page route.
      *
      * @throws InvalidArgumentException
      */
-    #[Route('/', name: 'empty_start_page', methods: ['GET'])]
+    #[Route('/api/v2', name: 'empty_start_page', methods: ['GET'])]
     public function index(): Response
     {
         return new Response('This page has been intentionally left empty.');