Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
php-versions: ['8.1']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
Expand All @@ -47,7 +47,7 @@ jobs:
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Cache composer dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions src/Domain/Model/Messaging/SubscriberList.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class SubscriberList implements DomainModel, Identity, CreationDate, Modificatio
#[Ignore]
protected ?DateTime $modificationDate = null;

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

public function getListPosition(): int
public function getListPosition(): ?int
{
return $this->listPosition;
}
Expand All @@ -130,7 +130,7 @@ public function setListPosition(int $listPosition): void
$this->listPosition = $listPosition;
}

public function getSubjectPrefix(): string
public function getSubjectPrefix(): ?string
{
return $this->subjectPrefix;
}
Expand Down
2 changes: 2 additions & 0 deletions src/Domain/Model/Subscription/Subscription.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use PhpList\Core\Domain\Model\Messaging\SubscriberList;
use PhpList\Core\Domain\Model\Traits\CreationDateTrait;
use PhpList\Core\Domain\Model\Traits\ModificationDateTrait;
use Symfony\Component\Serializer\Attribute\Groups;

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

public function getSubscriber(): Subscriber|Proxy|null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Repository for Subscriber models.
*
* @method Subscriber findOneByEmail(string $email)
* @method Subscriber|null findOneByEmail(string $email)
*
* @author Oliver Klee <[email protected]>
*/
Expand Down
Loading