Fix tests

Author: tatevikg1

src/Domain/Identity/Model/AdministratorToken.php

@@ -114,14 +114,8 @@ public function generateKey(): self
         return $this;
     }
 
-    public function getAdministrator(): Administrator|Proxy
+    public function getAdministrator(): Administrator
     {
         return $this->administrator;
     }
-
-    public function setAdministrator(Administrator $administrator): self
-    {
-        $this->administrator = $administrator;
-        return $this;
-    }
 }

src/Domain/Messaging/Model/Message.php

@@ -33,7 +33,7 @@ class Message implements DomainModel, Identity, ModificationDate, OwnableInterfa
     private ?int $id = null;
 
     #[ORM\Column(name: 'modified', type: 'datetime', nullable: false)]
-    private DateTimeImmutable $updatedAt;
+    private DateTime $updatedAt;
 
     #[ORM\Embedded(class: MessageFormat::class, columnPrefix: false)]
     private MessageFormat $format;
@@ -82,7 +82,7 @@ public function __construct(
         $this->owner = $owner;
         $this->template = $template;
         $this->listMessages = new ArrayCollection();
-        $this->updatedAt = new DateTimeImmutable();
+        $this->updatedAt = new DateTime();
         $this->metadata->setEntered(new DateTime());
     }
 
@@ -91,16 +91,15 @@ public function getId(): ?int
         return $this->id;
     }
 
-    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function getUpdatedAt(): DateTime
     {
-        return DateTime::createFromImmutable($this->updatedAt);
+        return $this->updatedAt;
     }
 
     #[ORM\PreUpdate]
     public function touchUpdatedTimestamp(): void
     {
-        $this->updatedAt = new DateTimeImmutable();
+        $this->updatedAt = new DateTime;
     }
 
     public function getFormat(): MessageFormat

src/Domain/Subscription/Model/Subscriber.php

@@ -26,6 +26,10 @@
 #[ORM\Index(name: 'enteredindex', columns: ['entered'])]
 #[ORM\Index(name: 'confidx', columns: ['confirmed'])]
 #[ORM\Index(name: 'blidx', columns: ['blacklisted'])]
+#[ORM\Index(name: 'optidx', columns: ['optedin'])]
+#[ORM\Index(name: 'uuididx', columns: ['uuid'])]
+#[ORM\Index(name: 'foreignkey', columns: ['foreignkey'])]
+#[ORM\UniqueConstraint(name: 'email', columns: ['email'])]
 #[ORM\HasLifecycleCallbacks]
 class Subscriber implements DomainModel, Identity, CreationDate, ModificationDate
 {
@@ -37,8 +41,8 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     #[ORM\Column(name: 'entered', type: 'datetime', nullable: true)]
     protected ?DateTime $createdAt = null;
 
-    #[ORM\Column(name: 'modified', type: 'datetime')]
-    private ?DateTime $updatedAt = null;
+    #[ORM\Column(name: 'modified', type: 'datetime', nullable: false)]
+    private DateTime $updatedAt;
 
     #[ORM\Column(unique: true)]
     private string $email = '';
@@ -52,7 +56,7 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     #[ORM\Column(name: 'bouncecount', type: 'integer')]
     private int $bounceCount = 0;
 
-    #[ORM\Column(name: 'uniqid', unique: true)]
+    #[ORM\Column(name: 'uniqid', type: 'string', length: 255, nullable: true)]
     private string $uniqueId = '';
 
     #[ORM\Column(name: 'htmlemail', type: 'boolean')]
@@ -61,8 +65,8 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     #[ORM\Column(type: 'boolean')]
     private bool $disabled = false;
 
-    #[ORM\Column(name: 'extradata', type: 'text')]
-    private ?string $extraData;
+    #[ORM\Column(name: 'extradata', type: 'text', nullable: true)]
+    private ?string $extraData = null;
 
     #[ORM\OneToMany(
         targetEntity: Subscription::class,
@@ -83,12 +87,34 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     )]
     private Collection $attributes;
 
+    #[ORM\Column(name: 'optedin', type: 'boolean')]
+    private bool $optedIn = false;
+
+    #[ORM\Column(name: 'uuid', type: 'string', length: 36)]
+    private string $uuid = '';
+
+    #[ORM\Column(name: 'subscribepage', type: 'integer', nullable: true)]
+    private ?int $subscribePage = null;
+
+    #[ORM\Column(name: 'rssfrequency', type: 'string', length: 100, nullable: true)]
+    private ?string $rssFrequency = null;
+
+    #[ORM\Column(name: 'password', type: 'string', length: 255, nullable: true)]
+    private ?string $password = null;
+
+    #[ORM\Column(name: 'passwordchanged', type: 'datetime', nullable: true)]
+    private ?DateTime $passwordChanged = null;
+
+    #[ORM\Column(name: 'foreignkey', type: 'string', length: 100, nullable: true)]
+    private ?string $foreignkey = null;
+
     public function __construct()
     {
         $this->subscriptions = new ArrayCollection();
         $this->attributes = new ArrayCollection();
         $this->extraData = '';
         $this->createdAt = new DateTime();
+        $this->updatedAt = new DateTime();
     }
 
     public function getId(): ?int
@@ -101,12 +127,11 @@ public function getCreatedAt(): ?DateTime
         return $this->createdAt;
     }
 
-    public function getUpdatedAt(): ?DateTime
+    public function getUpdatedAt(): DateTime
     {
         return $this->updatedAt;
     }
 
-    #[ORM\PrePersist]
     #[ORM\PreUpdate]
     public function updateUpdatedAt(): void
     {

src/Domain/Subscription/Model/SubscriberAttributeValue.php

@@ -25,7 +25,7 @@ class SubscriberAttributeValue implements DomainModel
     #[ORM\JoinColumn(name: 'userid', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
     private Subscriber $subscriber;
 
-    #[ORM\Column(name: 'value', type: 'text', nullable: true, columnDefinition: 'TEXT')]
+    #[ORM\Column(name: 'value', type: 'text', nullable: true)]
     private ?string $value = null;
 
     public function __construct(SubscriberAttributeDefinition $attributeDefinition, Subscriber $subscriber)

src/Domain/Subscription/Model/SubscriberList.php

@@ -43,7 +43,7 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
     private ?string $rssFeed = null;
 
     #[ORM\Column]
-    private ?string $description;
+    private string $description = '';
 
     #[ORM\Column(name: 'entered', type: 'datetime', nullable: true)]
     protected ?DateTime $createdAt = null;

tests/Integration/Domain/Identity/Fixtures/AdministratorTokenWithAdministratorFixture.php

@@ -45,12 +45,11 @@ public function load(ObjectManager $manager): void
                 $manager->persist($admin);
             }
 
-            $adminToken = new AdministratorToken();
+            $adminToken = new AdministratorToken($admin);
             $this->setSubjectId($adminToken, (int)$row['id']);
             $adminToken->setKey($row['value']);
             $this->setSubjectProperty($adminToken, 'expiry', new DateTime($row['expires']));
             $this->setSubjectProperty($adminToken, 'createdAt', (bool) $row['entered']);
-            $adminToken->setAdministrator($admin);
             $manager->persist($adminToken);
         } while (true);
 

tests/Integration/Domain/Identity/Fixtures/DetachedAdministratorTokenFixture.php

@@ -7,6 +7,7 @@
 use DateTime;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
+use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Identity\Model\AdministratorToken;
 use PhpList\Core\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
@@ -28,6 +29,9 @@ public function load(ObjectManager $manager): void
         }
 
         $headers = fgetcsv($handle);
+        $admin = (new Administrator())->setLoginName('admin');
+        $this->setSubjectId($admin, 1);
+        $manager->persist($admin);
 
         do {
             $data = fgetcsv($handle);
@@ -36,7 +40,7 @@ public function load(ObjectManager $manager): void
             }
             $row = array_combine($headers, $data);
 
-            $adminToken = new AdministratorToken();
+            $adminToken = new AdministratorToken($admin);
             $this->setSubjectId($adminToken, (int)$row['id']);
             $adminToken->setKey($row['value']);
 

tests/Integration/Domain/Identity/Repository/AdministratorTokenRepositoryTest.php

@@ -130,8 +130,7 @@ public function testSavePersistsAndFlushesModel()
         /** @var Administrator $administrator */
         $administrator = $administratorRepository->find(1);
 
-        $model = new AdministratorToken();
-        $model->setAdministrator($administrator);
+        $model = new AdministratorToken($administrator);
         $this->repository->save($model);
 
         self::assertSame($model, $this->repository->find($model->getId()));

tests/Unit/Domain/Identity/Model/AdministratorTokenTest.php

@@ -94,12 +94,4 @@ public function testGetAdministratorInitiallyReturnsNull(): void
     {
         self::assertNotNull($this->subject->getAdministrator());
     }
-
-    public function testSetAdministratorSetsAdministrator(): void
-    {
-        $model = new Administrator();
-        $this->subject->setAdministrator($model);
-
-        self::assertSame($model, $this->subject->getAdministrator());
-    }
 }

tests/Unit/Domain/Subscription/Model/SubscriberTest.php

@@ -56,9 +56,9 @@ public function testUpdateCreationDateSetsCreationDateToNow(): void
         self::assertSimilarDates(new \DateTime(), $this->subscriber->getCreatedAt());
     }
 
-    public function testgetUpdatedAtInitiallyReturnsNull(): void
+    public function testGetUpdatedAtInitiallyReturnsNotNull(): void
     {
-        self::assertNull($this->subscriber->getUpdatedAt());
+        self::assertNotNull($this->subscriber->getUpdatedAt());
     }
 
     public function testUpdateModificationDateSetsModificationDateToNow(): void