From cbe2996eea5f8aec50d2e35cf906d2298ca231e9 Mon Sep 17 00:00:00 2001 From: bencroker Date: Thu, 27 Oct 2022 09:58:29 -0500 Subject: [PATCH 1/2] Set default values for all nullable types --- src/events/CampaignTypeEvent.php | 2 +- src/events/ExportEvent.php | 2 +- src/events/ImportEvent.php | 2 +- src/events/MailingListTypeEvent.php | 2 +- src/events/SendoutEmailEvent.php | 8 ++++---- src/events/SendoutEvent.php | 2 +- src/events/SyncEvent.php | 2 +- src/jobs/ResaveElementsJob.php | 2 +- src/jobs/SendoutJob.php | 2 +- src/test/fixtures/elements/SendoutElementFixture.php | 4 ++-- tests/fixtures/LinksFixture.php | 2 +- tests/fixtures/PendingContactsFixture.php | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/events/CampaignTypeEvent.php b/src/events/CampaignTypeEvent.php index 4d52f545..fe505b34 100644 --- a/src/events/CampaignTypeEvent.php +++ b/src/events/CampaignTypeEvent.php @@ -13,7 +13,7 @@ class CampaignTypeEvent extends CancelableEvent /** * @var CampaignTypeModel|null */ - public ?CampaignTypeModel $campaignType; + public ?CampaignTypeModel $campaignType = null; /** * @var bool diff --git a/src/events/ExportEvent.php b/src/events/ExportEvent.php index 60bcc85b..ddcc0ea7 100644 --- a/src/events/ExportEvent.php +++ b/src/events/ExportEvent.php @@ -16,5 +16,5 @@ class ExportEvent extends CancelableEvent /** * @var ExportModel|null */ - public ?ExportModel $export; + public ?ExportModel $export = null; } diff --git a/src/events/ImportEvent.php b/src/events/ImportEvent.php index 7ce7422e..2f5dada6 100644 --- a/src/events/ImportEvent.php +++ b/src/events/ImportEvent.php @@ -16,5 +16,5 @@ class ImportEvent extends CancelableEvent /** * @var ImportModel|null */ - public ?ImportModel $import; + public ?ImportModel $import = null; } diff --git a/src/events/MailingListTypeEvent.php b/src/events/MailingListTypeEvent.php index 659cdf07..707ef772 100644 --- a/src/events/MailingListTypeEvent.php +++ b/src/events/MailingListTypeEvent.php @@ -13,7 +13,7 @@ class MailingListTypeEvent extends CancelableEvent /** * @var MailingListTypeModel|null */ - public ?MailingListTypeModel $mailingListType; + public ?MailingListTypeModel $mailingListType = null; /** * @var bool diff --git a/src/events/SendoutEmailEvent.php b/src/events/SendoutEmailEvent.php index 9874a012..368e99eb 100644 --- a/src/events/SendoutEmailEvent.php +++ b/src/events/SendoutEmailEvent.php @@ -15,20 +15,20 @@ class SendoutEmailEvent extends CancelableEvent /** * @var SendoutElement|null */ - public ?SendoutElement $sendout; + public ?SendoutElement $sendout = null; /** * @var ContactElement|null */ - public ?ContactElement $contact; + public ?ContactElement $contact = null; /** * @var Message|null */ - public ?Message $message; + public ?Message $message = null; /** * @var bool|null */ - public ?bool $success; + public ?bool $success = null; } diff --git a/src/events/SendoutEvent.php b/src/events/SendoutEvent.php index 9d588531..c9ffe19a 100644 --- a/src/events/SendoutEvent.php +++ b/src/events/SendoutEvent.php @@ -14,5 +14,5 @@ class SendoutEvent extends CancelableEvent /** * @var SendoutElement|null */ - public ?SendoutElement $sendout; + public ?SendoutElement $sendout = null; } diff --git a/src/events/SyncEvent.php b/src/events/SyncEvent.php index 31d30462..6cf09737 100644 --- a/src/events/SyncEvent.php +++ b/src/events/SyncEvent.php @@ -17,5 +17,5 @@ class SyncEvent extends CancelableEvent /** * @var MailingListElement|null */ - public ?MailingListElement $mailingList; + public ?MailingListElement $mailingList = null; } diff --git a/src/jobs/ResaveElementsJob.php b/src/jobs/ResaveElementsJob.php index a4814708..a8445cef 100644 --- a/src/jobs/ResaveElementsJob.php +++ b/src/jobs/ResaveElementsJob.php @@ -19,7 +19,7 @@ class ResaveElementsJob extends ResaveElements /** * @var int|null */ - public ?int $siteId; + public ?int $siteId = null; /** * @inheritdoc diff --git a/src/jobs/SendoutJob.php b/src/jobs/SendoutJob.php index e58c57ce..6e6079fa 100644 --- a/src/jobs/SendoutJob.php +++ b/src/jobs/SendoutJob.php @@ -27,7 +27,7 @@ class SendoutJob extends BaseJob implements RetryableJobInterface /** * @var string|null */ - public ?string $title; + public ?string $title = null; /** * @var int diff --git a/src/test/fixtures/elements/SendoutElementFixture.php b/src/test/fixtures/elements/SendoutElementFixture.php index 676ac32a..d4e897fa 100644 --- a/src/test/fixtures/elements/SendoutElementFixture.php +++ b/src/test/fixtures/elements/SendoutElementFixture.php @@ -21,12 +21,12 @@ abstract class SendoutElementFixture extends BaseElementFixture /** * @var int|null */ - public ?int $senderId; + public ?int $senderId = null; /** * @var int|null */ - public ?int $campaignId; + public ?int $campaignId = null; /** * @var array|null diff --git a/tests/fixtures/LinksFixture.php b/tests/fixtures/LinksFixture.php index bc1845bd..55ad3094 100644 --- a/tests/fixtures/LinksFixture.php +++ b/tests/fixtures/LinksFixture.php @@ -32,7 +32,7 @@ class LinksFixture extends ActiveFixture /** * @var int|null */ - public ?int $campaignId; + public ?int $campaignId = null; /** * @inheritdoc diff --git a/tests/fixtures/PendingContactsFixture.php b/tests/fixtures/PendingContactsFixture.php index 4cace5b0..3e2d4635 100644 --- a/tests/fixtures/PendingContactsFixture.php +++ b/tests/fixtures/PendingContactsFixture.php @@ -32,7 +32,7 @@ class PendingContactsFixture extends ActiveFixture /** * @var int|null */ - public ?int $mailingListId; + public ?int $mailingListId = null; /** * @inheritdoc From bf2335facc3173849b9703af160b31bca0ec279d Mon Sep 17 00:00:00 2001 From: bencroker Date: Thu, 27 Oct 2022 09:59:30 -0500 Subject: [PATCH 2/2] 2.1.16 --- CHANGELOG.md | 4 ++++ composer.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef14e889..e6d2c8ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Release Notes for Campaign +## 2.1.16 - 2022-10-27 +### Fixed +- Fixed all remaining uninitialized typed properties, as a precaution. + ## 2.1.15 - 2022-10-27 ### Fixed - Fixed a missed uninitialized typed property that was causing verification links to fail ([#338](https://github.com/putyourlightson/craft-campaign/issues/338)). diff --git a/composer.json b/composer.json index 062d77d0..4fcfaedd 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "putyourlightson/craft-campaign", "description": "Send and manage email campaigns, contacts and mailing lists.", - "version": "2.1.15", + "version": "2.1.16", "type": "craft-plugin", "homepage": "https://putyourlightson.com/plugins/campaign", "license": "proprietary",