git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "02ae5285"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "649a5c01"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I870ad468fba026cc5abf3c5699ed1e12ff28b32b
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php
index 843ce61..1a9d16e 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php
@@ -18,35 +18,12 @@
*/
final class Message extends Message\AbstractMessage implements MessageInterface
{
- /**
- * @var bool
- */
- private $messageNumberVerified = false;
-
- /**
- * @var int
- */
- private $imapMsgNo = 0;
-
- /**
- * @var bool
- */
- private $structureLoaded = false;
-
- /**
- * @var null|Message\Headers
- */
- private $headers;
-
- /**
- * @var null|string
- */
- private $rawHeaders;
-
- /**
- * @var null|string
- */
- private $rawMessage;
+ private bool $messageNumberVerified = false;
+ private int $imapMsgNo = 0;
+ private bool $structureLoaded = false;
+ private ?Message\Headers $headers = null;
+ private ?string $rawHeaders = null;
+ private ?string $rawMessage = null;
/**
* Constructor.
@@ -59,9 +36,6 @@
parent::__construct($resource, $messageNumber, '1', new \stdClass());
}
- /**
- * Lazy load structure.
- */
protected function lazyLoadStructure(): void
{
if (true === $this->structureLoaded) {
@@ -99,9 +73,6 @@
$this->setStructure($structure);
}
- /**
- * Ensure message exists.
- */
protected function assertMessageExists(int $messageNumber): void
{
if (true === $this->messageNumberVerified) {
@@ -138,9 +109,6 @@
return $this->imapMsgNo;
}
- /**
- * Get raw message headers.
- */
public function getRawHeaders(): string
{
if (null === $this->rawHeaders) {
@@ -156,11 +124,6 @@
return $this->rawHeaders;
}
- /**
- * Get the raw message, including all headers, parts, etc. unencoded and unparsed.
- *
- * @return string the raw message
- */
public function getRawMessage(): string
{
if (null === $this->rawMessage) {
@@ -170,9 +133,6 @@
return $this->rawMessage;
}
- /**
- * Get message headers.
- */
public function getHeaders(): Message\Headers
{
if (null === $this->headers) {
@@ -198,67 +158,44 @@
$this->headers = null;
}
- /**
- * Get message recent flag value (from headers).
- */
public function isRecent(): ?string
{
- return $this->getHeaders()->get('recent');
+ $recent = $this->getHeaders()->get('recent');
+ \assert(null === $recent || \is_string($recent));
+
+ return $recent;
}
- /**
- * Get message unseen flag value (from headers).
- */
public function isUnseen(): bool
{
return 'U' === $this->getHeaders()->get('unseen');
}
- /**
- * Get message flagged flag value (from headers).
- */
public function isFlagged(): bool
{
return 'F' === $this->getHeaders()->get('flagged');
}
- /**
- * Get message answered flag value (from headers).
- */
public function isAnswered(): bool
{
return 'A' === $this->getHeaders()->get('answered');
}
- /**
- * Get message deleted flag value (from headers).
- */
public function isDeleted(): bool
{
return 'D' === $this->getHeaders()->get('deleted');
}
- /**
- * Get message draft flag value (from headers).
- */
public function isDraft(): bool
{
return 'X' === $this->getHeaders()->get('draft');
}
- /**
- * Has the message been marked as read?
- */
public function isSeen(): bool
{
return 'N' !== $this->getHeaders()->get('recent') && 'U' !== $this->getHeaders()->get('unseen');
}
- /**
- * Mark message as seen.
- *
- * @deprecated since version 1.1, to be removed in 2.0
- */
public function maskAsSeen(): bool
{
\trigger_error(\sprintf('%s is deprecated and will be removed in 2.0. Use %s::markAsSeen instead.', __METHOD__, __CLASS__), \E_USER_DEPRECATED);
@@ -266,19 +203,11 @@
return $this->markAsSeen();
}
- /**
- * Mark message as seen.
- */
public function markAsSeen(): bool
{
return $this->setFlag('\\Seen');
}
- /**
- * Move message to another mailbox.
- *
- * @throws MessageCopyException
- */
public function copy(MailboxInterface $mailbox): void
{
// 'deleted' header changed, force to reload headers, would be better to set deleted flag to true on header
@@ -289,11 +218,6 @@
}
}
- /**
- * Move message to another mailbox.
- *
- * @throws MessageMoveException
- */
public function move(MailboxInterface $mailbox): void
{
// 'deleted' header changed, force to reload headers, would be better to set deleted flag to true on header
@@ -304,11 +228,6 @@
}
}
- /**
- * Delete message.
- *
- * @throws MessageDeleteException
- */
public function delete(): void
{
// 'deleted' header changed, force to reload headers, would be better to set deleted flag to true on header
@@ -319,11 +238,6 @@
}
}
- /**
- * Undelete message.
- *
- * @throws MessageUndeleteException
- */
public function undelete(): void
{
// 'deleted' header changed, force to reload headers, would be better to set deleted flag to false on header
@@ -333,11 +247,6 @@
}
}
- /**
- * Set Flag Message.
- *
- * @param string $flag \Seen, \Answered, \Flagged, \Deleted, and \Draft
- */
public function setFlag(string $flag): bool
{
$result = \imap_setflag_full($this->resource->getStream(), (string) $this->getNumber(), $flag, \ST_UID);
@@ -347,11 +256,6 @@
return $result;
}
- /**
- * Clear Flag Message.
- *
- * @param string $flag \Seen, \Answered, \Flagged, \Deleted, and \Draft
- */
public function clearFlag(string $flag): bool
{
$result = \imap_clearflag_full($this->resource->getStream(), (string) $this->getNumber(), $flag, \ST_UID);