Skip to content

Commit ace1746

Browse files
committed
ISSUE-344: type fix
1 parent 6a880d3 commit ace1746

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
php-versions: ['8.1']
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2929
- name: Setup PHP, with composer and extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
@@ -47,7 +47,7 @@ jobs:
4747
id: composer-cache
4848
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
4949
- name: Cache composer dependencies
50-
uses: actions/cache@v2
50+
uses: actions/cache@v3
5151
with:
5252
path: ${{ steps.composer-cache.outputs.dir }}
5353
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

src/Domain/Model/Messaging/SubscriberList.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
5757
#[Ignore]
5858
protected ?DateTime $modificationDate = null;
5959

60-
#[ORM\Column(name: 'listorder', type: 'integer')]
60+
#[ORM\Column(name: 'listorder', type: 'integer', nullable: true)]
6161
#[SerializedName('list_position')]
6262
#[Groups(['SubscriberList'])]
6363
private ?int $listPosition;
@@ -120,7 +120,7 @@ public function setDescription(string $description): void
120120
$this->description = $description;
121121
}
122122

123-
public function getListPosition(): int
123+
public function getListPosition(): ?int
124124
{
125125
return $this->listPosition;
126126
}
@@ -130,7 +130,7 @@ public function setListPosition(int $listPosition): void
130130
$this->listPosition = $listPosition;
131131
}
132132

133-
public function getSubjectPrefix(): string
133+
public function getSubjectPrefix(): ?string
134134
{
135135
return $this->subjectPrefix;
136136
}

src/Domain/Model/Subscription/Subscription.php

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PhpList\Core\Domain\Model\Messaging\SubscriberList;
1616
use PhpList\Core\Domain\Model\Traits\CreationDateTrait;
1717
use PhpList\Core\Domain\Model\Traits\ModificationDateTrait;
18+
use Symfony\Component\Serializer\Attribute\Groups;
1819

1920
/**
2021
* This class represents subscriber who can subscribe to multiple subscriber lists and can receive email messages from
@@ -57,6 +58,7 @@ class Subscription implements DomainModel, CreationDate, ModificationDate
5758
)]
5859
#[ORM\JoinColumn(name: 'listid', onDelete: 'CASCADE')]
5960
#[Ignore]
61+
#[Groups(['SubscriberListMembers'])]
6062
private ?SubscriberList $subscriberList = null;
6163

6264
public function getSubscriber(): Subscriber|Proxy|null

0 commit comments

Comments
 (0)