ISSUE-337: test fix

Author: tatevikg1

composer.json

@@ -35,29 +35,30 @@
     },
     "require": {
         "php": "^8.1",
-        "doctrine/orm": "^2.11",
-        "doctrine/common": "^3.3",
-        "doctrine/doctrine-bundle": "^2.7",
-        "symfony/symfony": "^6.4",
         "symfony/dependency-injection": "^6.4",
         "symfony/config": "^6.4",
         "symfony/yaml": "^6.4",
-        "doctrine/annotations": "*",
-        "symfony/error-handler": "*",
-        "symfony/serializer": "*",
+        "symfony/error-handler": "^6.4",
+        "symfony/serializer": "^6.4",
         "symfony/monolog-bundle": "^3.10",
-        "symfony/serializer-pack": "^1.3"
+        "symfony/serializer-pack": "^1.3",
+        "symfony/orm-pack": "^2.4",
+        "symfony/asset": "^6.4",
+        "symfony/security-csrf": "^6.4",
+        "symfony/form": "^6.4",
+        "symfony/validator": "^6.4",
+        "doctrine/doctrine-fixtures-bundle": "^3.7",
+        "doctrine/instantiator": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.2",
+        "phpunit/phpunit": "^9.5",
         "guzzlehttp/guzzle": "^6.3.0",
         "squizlabs/php_codesniffer": "^3.2.0",
         "phpstan/phpstan": "^0.12.57",
         "nette/caching": "^3.0.0",
         "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
-        "doctrine/instantiator": "^1.0.5",
-        "doctrine/doctrine-fixtures-bundle": "^3.6"
+        "symfony/test-pack": "^1.1"
     },
     "suggest": {
         "phplist/web-frontend": "5.0.x-dev",

config/config.yml

@@ -16,16 +16,21 @@ framework:
         strict_requirements: ~
     form: ~
     csrf_protection: ~
-    validation: { enable_annotations: true }
+    validation:
+        enable_attributes: true
+        email_validation_mode: html5
     #serializer: { enable_annotations: true }
     #templating:
         #engines: ['twig']
     default_locale: '%locale%'
     trusted_hosts: ~
+    handle_all_throwables: true
     session:
         # https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
         handler_id: session.handler.native_file
         save_path: '%kernel.application_dir%/var/sessions/%kernel.environment%'
+        cookie_secure: auto
+        cookie_samesite: lax
     fragments: ~
     http_method_override: true
     assets: ~
@@ -59,3 +64,5 @@ doctrine:
                 type: attribute
                 dir: '%kernel.project_dir%/src/Domain/Model/'
                 prefix: 'PhpList\Core\Domain\Model\'
+        controller_resolver:
+            auto_mapping: true

config/config_test.yml

@@ -4,7 +4,8 @@ imports:
 framework:
     test: ~
     session:
-        storage_id: session.storage.mock_file
+        cookie_domain: session.storage.mock_file
+        handler_id: null
     profiler:
         collect: false
 
@@ -13,3 +14,7 @@ doctrine:
         driver: 'pdo_sqlite'
         memory: true
         charset: UTF8
+#    orm:
+#        entity_managers:
+#            default:
+#                report_fields_where_declared: true

config/repositories.yml

@@ -3,6 +3,8 @@ services:
         parent: PhpList\Core\Domain\Repository
         arguments:
             - PhpList\Core\Domain\Model\Identity\Administrator
+            - Doctrine\ORM\Mapping\ClassMetadata\ClassMetadata
+            - PhpList\Core\Security\HashGenerator
 
     PhpList\Core\Domain\Repository\Identity\AdministratorTokenRepository:
         parent: PhpList\Core\Domain\Repository

phpdoc.xml

@@ -9,4 +9,4 @@
         <output>docs/phpdocumentor</output>
     </paths>
 
-</phpdocumentor>
+</phpdocumentor>

phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"

public/app_test.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use PhpList\Core\Core\Bootstrap;

src/Domain/Model/Messaging/SubscriberList.php

@@ -78,8 +78,8 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
     private ?Administrator $owner = null;
 
     #[ORM\OneToMany(
-        mappedBy: "subscriberList",
         targetEntity: "PhpList\Core\Domain\Model\Subscription\Subscription",
+        mappedBy: "subscriberList",
         cascade: ["remove"]
     )]
     #[MaxDepth(1)]
@@ -102,6 +102,8 @@ public function __construct()
     {
         $this->subscriptions = new ArrayCollection();
         $this->subscribers = new ArrayCollection();
+        $this->listPosition = 0;
+        $this->subjectPrefix = '';
     }
 
     public function getName(): string
@@ -126,7 +128,7 @@ public function setDescription(string $description): void
 
     public function getListPosition(): int
     {
-        return $this->listPosition ?? 0;
+        return $this->listPosition;
     }
 
     public function setListPosition(int $listPosition): void
@@ -136,7 +138,7 @@ public function setListPosition(int $listPosition): void
 
     public function getSubjectPrefix(): string
     {
-        return $this->subjectPrefix ?? '';
+        return $this->subjectPrefix;
     }
 
     public function setSubjectPrefix(string $subjectPrefix): void
@@ -156,7 +158,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

@@ -103,6 +103,7 @@ public function __construct()
     {
         $this->subscriptions = new ArrayCollection();
         $this->subscribedLists = new ArrayCollection();
+        $this->extraData = '';
     }
 
     public function isConfirmed(): bool
@@ -188,7 +189,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/CreationDateTrait.php

@@ -5,7 +5,7 @@
 namespace PhpList\Core\Domain\Model\Traits;
 
 use DateTime;
-use Doctrine\ORM\Mapping\PrePersist;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
  * This trait provides an automatic creation date for models.
@@ -37,13 +37,7 @@ private function setCreationDate(DateTime $creationDate): void
         $this->creationDate = $creationDate;
     }
 
-    /**
-     * Updates the creation date to now.
-     *
-     * @PrePersist
-     *
-     * @return void
-     */
+    #[ORM\PrePersist]
     public function updateCreationDate(): void
     {
         $this->setCreationDate(new DateTime());