Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/yii-blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
bencroker committed Oct 27, 2022
2 parents fc5ef2c + bf2335f commit 05ffc99
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 17 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)).
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/events/CampaignTypeEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class CampaignTypeEvent extends CancelableEvent
/**
* @var CampaignTypeModel|null
*/
public ?CampaignTypeModel $campaignType;
public ?CampaignTypeModel $campaignType = null;

/**
* @var bool
Expand Down
2 changes: 1 addition & 1 deletion src/events/ExportEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ class ExportEvent extends CancelableEvent
/**
* @var ExportModel|null
*/
public ?ExportModel $export;
public ?ExportModel $export = null;
}
2 changes: 1 addition & 1 deletion src/events/ImportEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ class ImportEvent extends CancelableEvent
/**
* @var ImportModel|null
*/
public ?ImportModel $import;
public ?ImportModel $import = null;
}
2 changes: 1 addition & 1 deletion src/events/MailingListTypeEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MailingListTypeEvent extends CancelableEvent
/**
* @var MailingListTypeModel|null
*/
public ?MailingListTypeModel $mailingListType;
public ?MailingListTypeModel $mailingListType = null;

/**
* @var bool
Expand Down
8 changes: 4 additions & 4 deletions src/events/SendoutEmailEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion src/events/SendoutEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ class SendoutEvent extends CancelableEvent
/**
* @var SendoutElement|null
*/
public ?SendoutElement $sendout;
public ?SendoutElement $sendout = null;
}
2 changes: 1 addition & 1 deletion src/events/SyncEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ class SyncEvent extends CancelableEvent
/**
* @var MailingListElement|null
*/
public ?MailingListElement $mailingList;
public ?MailingListElement $mailingList = null;
}
2 changes: 1 addition & 1 deletion src/jobs/ResaveElementsJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ResaveElementsJob extends ResaveElements
/**
* @var int|null
*/
public ?int $siteId;
public ?int $siteId = null;

/**
* @inheritdoc
Expand Down
2 changes: 1 addition & 1 deletion src/jobs/SendoutJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class SendoutJob extends BaseJob implements RetryableJobInterface
/**
* @var string|null
*/
public ?string $title;
public ?string $title = null;

/**
* @var int
Expand Down
4 changes: 2 additions & 2 deletions src/test/fixtures/elements/SendoutElementFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/LinksFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class LinksFixture extends ActiveFixture
/**
* @var int|null
*/
public ?int $campaignId;
public ?int $campaignId = null;

/**
* @inheritdoc
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/PendingContactsFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class PendingContactsFixture extends ActiveFixture
/**
* @var int|null
*/
public ?int $mailingListId;
public ?int $mailingListId = null;

/**
* @inheritdoc
Expand Down

0 comments on commit 05ffc99

Please sign in to comment.