From 5af6e30b8fc67d0f08acb1318cbea08c8b7663b3 Mon Sep 17 00:00:00 2001 From: djmaze Date: Fri, 20 Mar 2020 15:37:55 +0100 Subject: [PATCH] Resolve Declaration *Collection::append should be compatible with Collection::append --- .../0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php | 5 +++-- .../v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php | 3 ++- .../v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php | 3 ++- .../0.0.0/app/libraries/MailSo/Mime/AttachmentCollection.php | 5 +++-- .../v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php | 3 ++- .../v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php | 3 ++- .../0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php | 5 +++-- .../v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php | 3 ++- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php index 8dc6afa27..864d3d7fe 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php @@ -27,9 +27,10 @@ class AttachmentCollection extends \MailSo\Base\Collection return new self(); } - public function append(Attachment $oFolder, bool $bToTop = false) : void + public function append($oAttachment, bool $bToTop = false) : void { - parent::append($oFolder, $bToTop); + assert($oAttachment instanceof Attachment); + parent::append($oAttachment, $bToTop); } public function InlineCount() : int diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php index 7cb25139b..fff65aade 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php @@ -58,8 +58,9 @@ class FolderCollection extends \MailSo\Base\Collection return new self(); } - public function append(Folder $oFolder, bool $bToTop = false) : void + public function append($oFolder, bool $bToTop = false) : void { + assert($oFolder instanceof Folder); parent::append($oFolder, $bToTop); } diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php index 898e0e0f2..dfd22c91d 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php @@ -89,8 +89,9 @@ class MessageCollection extends \MailSo\Base\Collection return new self(); } - public function append(Message $oMessage, bool $bToTop = false) : void + public function append($oMessage, bool $bToTop = false) : void { + assert($oMessage instanceof Message); parent::append($oMessage, $bToTop); } diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/AttachmentCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/AttachmentCollection.php index 2a72d8256..97470c826 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/AttachmentCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/AttachmentCollection.php @@ -27,9 +27,10 @@ class AttachmentCollection extends \MailSo\Base\Collection return new self(); } - public function append(Attachment $oFolder, bool $bToTop = false) : void + public function append($oAttachment, bool $bToTop = false) : void { - parent::append($oFolder, $bToTop); + assert($oAttachment instanceof Attachment); + parent::append($oAttachment, $bToTop); } public function LinkedAttachments() : array diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php index d0633e736..d3a11f640 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php @@ -33,8 +33,9 @@ class EmailCollection extends \MailSo\Base\Collection return new self($sEmailAddresses); } - public function append(Email $oEmail, bool $bToTop = false) : void + public function append($oEmail, bool $bToTop = false) : void { + assert($oEmail instanceof Email); parent::append($oEmail, $bToTop); } diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php index d1d4e9e8f..b8dfa2d52 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php @@ -39,8 +39,9 @@ class HeaderCollection extends \MailSo\Base\Collection return new self($sRawHeaders, $bStoreRawHeaders); } - public function append(Header $oHeader, bool $bToTop = false) : void + public function append($oHeader, bool $bToTop = false) : void { + assert($oHeader instanceof Header); parent::append($oHeader, $bToTop); } diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php index 4bfd90785..afedba8ec 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php @@ -32,9 +32,10 @@ class ParameterCollection extends \MailSo\Base\Collection return new self($sRawParams); } - public function append(Parameter $oHeader, bool $bToTop = false) : void + public function append($oParameter, bool $bToTop = false) : void { - parent::append($oHeader, $bToTop); + assert($oParameter instanceof Parameter); + parent::append($oParameter, $bToTop); } public function ParameterValueByName(string $sName) : string diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php index a21adc934..f4ee9f292 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php @@ -27,8 +27,9 @@ class PartCollection extends \MailSo\Base\Collection return new self(); } - public function append(Part $oPart, bool $bToTop = false) : void + public function append($oPart, bool $bToTop = false) : void { + assert($oPart instanceof Part); parent::append($oPart, $bToTop); }