Skip to content

Commit b4d1e8a

Browse files
committed
ISSUE-345: fix traits
1 parent 29657c9 commit b4d1e8a

File tree

7 files changed

+25
-12
lines changed

7 files changed

+25
-12
lines changed

src/Domain/Model/Identity/AdministratorToken.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ private function setCreationDate(DateTime $creationDate): self
7171
}
7272

7373
#[ORM\PrePersist]
74-
public function updateCreationDate(): void
74+
public function updateCreationDate(): DomainModel
7575
{
7676
$this->setCreationDate(new DateTime());
77+
return $this;
7778
}
7879

7980
public function getExpiry(): DateTime

src/Domain/Model/Interfaces/CreationDate.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* The CreationDateTrait is the default implementation.
1414
*
1515
* @author Oliver Klee <[email protected]>
16+
* @author Tatevik Grigoryan <[email protected]>
1617
*/
1718
interface CreationDate
1819
{
@@ -26,7 +27,7 @@ public function getCreationDate(): ?DateTime;
2627
*
2728
* @PrePersist
2829
*
29-
* @return void
30+
* @return DomainModel
3031
*/
31-
public function updateCreationDate(): void;
32+
public function updateCreationDate(): DomainModel;
3233
}

src/Domain/Model/Interfaces/ModificationDate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function getModificationDate(): ?DateTime;
2727
* @Mapping\PrePersist
2828
* @Mapping\PreUpdate
2929
*
30-
* @return void
30+
* @return DomainModel
3131
*/
32-
public function updateModificationDate(): void;
32+
public function updateModificationDate(): DomainModel;
3333
}

src/Domain/Model/Subscription/Subscriber.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,10 @@ public function setUniqueId(string $uniqueId): self
164164
}
165165

166166
#[ORM\PrePersist]
167-
public function generateUniqueId(): void
167+
public function generateUniqueId(): self
168168
{
169169
$this->setUniqueId(bin2hex(random_bytes(16)));
170+
return $this;
170171
}
171172

172173
public function getEmail(): string

src/Domain/Model/Subscription/SubscriberList.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,10 @@ public function getListPosition(): ?int
126126
return $this->listPosition;
127127
}
128128

129-
public function setListPosition(int $listPosition): void
129+
public function setListPosition(int $listPosition): self
130130
{
131131
$this->listPosition = $listPosition;
132+
return $this;
132133
}
133134

134135
public function getSubjectPrefix(): ?string

src/Domain/Model/Traits/CreationDateTrait.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use DateTime;
88
use Doctrine\ORM\Mapping as ORM;
9+
use PhpList\Core\Domain\Model\Interfaces\DomainModel;
910

1011
/**
1112
* This trait provides an automatic creation date for models.
@@ -16,6 +17,7 @@
1617
* and also to have a $creationDate property with the correct column name mapping.
1718
*
1819
* @author Oliver Klee <[email protected]>
20+
* @author Tatevik Grigoryan <[email protected]>
1921
*/
2022
trait CreationDateTrait
2123
{
@@ -30,16 +32,19 @@ public function getCreationDate(): ?DateTime
3032
/**
3133
* @param DateTime $creationDate
3234
*
33-
* @return void
35+
* @return DomainModel
3436
*/
35-
private function setCreationDate(DateTime $creationDate): void
37+
private function setCreationDate(DateTime $creationDate): DomainModel
3638
{
3739
$this->creationDate = $creationDate;
40+
return $this;
3841
}
3942

4043
#[ORM\PrePersist]
41-
public function updateCreationDate(): void
44+
public function updateCreationDate(): DomainModel
4245
{
4346
$this->setCreationDate(new DateTime());
47+
48+
return $this;
4449
}
4550
}

src/Domain/Model/Traits/ModificationDateTrait.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use DateTime;
88
use Doctrine\ORM\Mapping as ORM;
9+
use PhpList\Core\Domain\Model\Interfaces\DomainModel;
910

1011
/**
1112
* This trait provides an automatic modification date for models.
@@ -27,15 +28,18 @@ public function getModificationDate(): ?DateTime
2728
return $this->modificationDate;
2829
}
2930

30-
private function setModificationDate(DateTime $modificationDate): void
31+
private function setModificationDate(DateTime $modificationDate): DomainModel
3132
{
3233
$this->modificationDate = $modificationDate;
34+
return $this;
3335
}
3436

3537
#[ORM\PrePersist]
3638
#[ORM\PreUpdate]
37-
public function updateModificationDate(): void
39+
public function updateModificationDate(): DomainModel
3840
{
3941
$this->setModificationDate(new DateTime());
42+
43+
return $this;
4044
}
4145
}

0 commit comments

Comments
 (0)