test fix

Author: tatevikg1

config/PHPMD/rules.xml

@@ -50,7 +50,7 @@
     <!-- rules from the "naming" rule set -->
     <rule ref="rulesets/naming.xml/ShortVariable">
         <properties>
-            <property name="exceptions" value="id"/>
+            <property name="exceptions" value="id,ip"/>
         </properties>
     </rule>
     <rule ref="rulesets/naming.xml/LongVariable">

src/Domain/Model/Identity/Administrator.php

@@ -42,9 +42,6 @@ class Administrator implements DomainModel, Identity, CreationDate, Modification
     #[ORM\Column(name: 'created', type: 'datetime')]
     protected ?DateTime $creationDate = null;
 
-    #[ORM\Column(name: 'modified', type: 'datetime')]
-    protected ?DateTime $modificationDate;
-
     #[ORM\Column(name: 'modifiedby', type: 'string', length: 66, nullable: true)]
     protected ?string $modifiedBy;
 

src/Domain/Model/Messaging/ListMessage.php

@@ -27,9 +27,6 @@ class ListMessage implements DomainModel, Identity, ModificationDate
     #[ORM\Column(name: 'messageid', type: "integer")]
     private int $messageId;
 
-    #[ORM\Column(name: 'modified', type: 'datetime')]
-    protected ?DateTime $modificationDate;
-
     #[ORM\Column(name: "listid", type: "integer")]
     private int $listId;
 

src/Domain/Model/Messaging/SendProcess.php

@@ -14,6 +14,7 @@
 
 #[ORM\Entity]
 #[ORM\Table(name: "phplist_sendprocess")]
+#[ORM\HasLifecycleCallbacks]
 class SendProcess implements DomainModel, Identity, ModificationDate
 {
     use IdentityTrait;
@@ -22,9 +23,6 @@ class SendProcess implements DomainModel, Identity, ModificationDate
     #[ORM\Column(name: "started", type: "datetime", nullable: true)]
     private ?DateTime $started = null;
 
-    #[ORM\Column(name: "modified", type: "datetime", options: ["default" => "CURRENT_TIMESTAMP"])]
-    private ?DateTime $modificationDate = null;
-
     #[ORM\Column(name: "alive", type: "integer", nullable: true, options: ["default" => 1])]
     private ?int $alive = 1;
 
@@ -45,11 +43,6 @@ public function setStartedDate(DateTime $started): self
         return $this;
     }
 
-    public function getModificationDate(): ?DateTime
-    {
-        return $this->modificationDate;
-    }
-
     public function getAlive(): ?int
     {
         return $this->alive;

src/Domain/Model/Messaging/SubscriberList.php

@@ -54,10 +54,6 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
     #[Groups(['SubscriberList'])]
     protected ?DateTime $creationDate = null;
 
-    #[ORM\Column(name: 'modified', type: 'datetime')]
-    #[Ignore]
-    protected ?DateTime $modificationDate = null;
-
     #[ORM\Column(name: 'listorder', type: 'integer', nullable: true)]
     #[SerializedName('list_position')]
     #[Groups(['SubscriberList'])]

src/Domain/Model/Subscription/Subscriber.php

@@ -43,10 +43,6 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     #[Groups(['SubscriberListMembers'])]
     protected ?DateTime $creationDate = null;
 
-    #[ORM\Column(name: 'modified', type: 'datetime')]
-    #[Ignore]
-    protected ?DateTime $modificationDate = null;
-
     #[ORM\Column(unique: true)]
     #[SerializedName('email')]
     #[Groups(['SubscriberListMembers'])]

src/Domain/Model/Subscription/Subscription.php

@@ -38,10 +38,6 @@ class Subscription implements DomainModel, CreationDate, ModificationDate
     #[SerializedName('creation_date')]
     protected ?DateTime $creationDate = null;
 
-    #[ORM\Column(name: 'modified', type: 'datetime')]
-    #[Ignore]
-    protected ?DateTime $modificationDate = null;
-
     #[ORM\Id]
     #[ORM\ManyToOne(
         targetEntity: 'PhpList\Core\Domain\Model\Subscription\Subscriber',

src/Domain/Model/Traits/ModificationDateTrait.php

@@ -19,6 +19,9 @@
  */
 trait ModificationDateTrait
 {
+    #[ORM\Column(name: 'modified', type: 'datetime')]
+    private ?DateTime $modificationDate = null;
+
     public function getModificationDate(): ?DateTime
     {
         return $this->modificationDate;