Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 08:27:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

IMAP oLastResponse not needed

Browse source
This commit is contained in:
djmaze 2021-10-28 10:42:33 +02:00
parent 6c84313c98
commit 371797cab1
2 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
View file

@ -39,9 +39,6 @@ class ResponseException extends \MailSo\Imap\Exceptions\Exception
public function GetLastResponse() : ?\MailSo\Imap\Response public function GetLastResponse() : ?\MailSo\Imap\Response
{ {
if ($this->oResponses && \count($this->oResponses)) { return $this->oResponses ? $this->oResponses->getLast() : null;
return $this->oResponses[count($this->oResponses) - 1];
}
return null;
} }
} }

17
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -39,11 +39,6 @@ class ImapClient extends \MailSo\Net\NetClient
*/ */
private $oCurrentFolderInfo = null; private $oCurrentFolderInfo = null;
/**
* @var ResponseCollection
*/
private $oLastResponse;
/** /**
* @var array * @var array
*/ */
@ -76,7 +71,6 @@ class ImapClient extends \MailSo\Net\NetClient
function __construct() function __construct()
{ {
$this->oLastResponse = new ResponseCollection;
\ini_set('xdebug.max_nesting_level', 500); \ini_set('xdebug.max_nesting_level', 500);
} }
@ -989,11 +983,11 @@ class ImapClient extends \MailSo\Net\NetClient
\MailSo\Base\Utils::MultipleStreamWriter($rMessageAppendStream, array($this->ConnectionResource())); \MailSo\Base\Utils::MultipleStreamWriter($rMessageAppendStream, array($this->ConnectionResource()));
$this->sendRaw(''); $this->sendRaw('');
$this->getResponse(); $oResponse = $this->getResponse();
if (null !== $iUid) if (null !== $iUid)
{ {
$oLast = $this->GetLastResponse()->getLast(); $oLast = $oResponse->getLast();
if ($oLast && Enumerations\ResponseType::TAGGED === $oLast->ResponseType && \is_array($oLast->OptionalResponse)) if ($oLast && Enumerations\ResponseType::TAGGED === $oLast->ResponseType && \is_array($oLast->OptionalResponse))
{ {
if (\strlen($oLast->OptionalResponse[0]) && if (\strlen($oLast->OptionalResponse[0]) &&
@ -1099,11 +1093,6 @@ class ImapClient extends \MailSo\Net\NetClient
\MailSo\Log\Enumerations\Type::NOTICE, true); \MailSo\Log\Enumerations\Type::NOTICE, true);
} }
public function GetLastResponse() : ResponseCollection
{
return $this->oLastResponse;
}
/** /**
* @throws \MailSo\Imap\Exceptions\ResponseNotFoundException * @throws \MailSo\Imap\Exceptions\ResponseNotFoundException
* @throws \MailSo\Imap\Exceptions\InvalidResponseException * @throws \MailSo\Imap\Exceptions\InvalidResponseException
@ -1140,8 +1129,6 @@ class ImapClient extends \MailSo\Net\NetClient
} }
} }
$this->oLastResponse = $oResult;
$oResult->validate(); $oResult->validate();
} catch (\Throwable $e) { } catch (\Throwable $e) {