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

Changed: MailSo\*Collection now extends \ArrayObject

Browse source 
Changed: fixed __constructor param type hinting
Replace: &$o with $o as objects don't need & referencing
This commit is contained in:
djmaze 2020-03-18 23:14:00 +01:00
parent 9bb44e7f98
commit f6fdb69c65
30 changed files with 290 additions and 736 deletions
Download patch file Download diff file Expand all files Collapse all files

32
rainloop/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
View file

@ -17,7 +17,7 @@ namespace MailSo\Mime;
*/
class EmailCollection extends \MailSo\Base\Collection
{
protected function __construct($sEmailAddresses = '')
protected function __construct(string $sEmailAddresses = '')
{
parent::__construct();
@ -40,9 +40,8 @@ class EmailCollection extends \MailSo\Base\Collection
public function ToArray() : array
{
$aReturn = $aEmails = array();
$aEmails =& $this->GetAsArray();
foreach ($aEmails as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
$aReturn = array();
foreach ($this as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
{
$aReturn[] = $oEmail->ToArray();
}
@ -52,10 +51,9 @@ class EmailCollection extends \MailSo\Base\Collection
public function MergeWithOtherCollection(EmailCollection $oEmails) : self
{
$aEmails =& $oEmails->GetAsArray();
foreach ($aEmails as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
foreach ($oEmails as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
{
$this->Add($oEmail);
$this->append($oEmail);
}
return $this;
@ -63,30 +61,26 @@ class EmailCollection extends \MailSo\Base\Collection
public function Unique() : self
{
$aCache = array();
$aReturn = array();
$aEmails =& $this->GetAsArray();
foreach ($aEmails as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
foreach ($this as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
{
$sEmail = $oEmail->GetEmail();
if (!isset($aCache[$sEmail]))
if (!isset($aReturn[$sEmail]))
{
$aCache[$sEmail] = true;
$aReturn[] = $oEmail;
$aReturn[$sEmail] = $oEmail;
}
}
$this->SetAsArray($aReturn);
$this->exchangeArray(array_values($aReturn));
return $this;
}
public function ToString(bool $bConvertSpecialsName = false, bool $bIdn = false) : string
{
$aReturn = $aEmails = array();
$aEmails =& $this->GetAsArray();
foreach ($aEmails as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
$aReturn = array();
foreach ($this as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
{
$aReturn[] = $oEmail->ToString($bConvertSpecialsName, $bIdn);
}
@ -174,7 +168,7 @@ class EmailCollection extends \MailSo\Base\Collection
try
{
$this->Add(
$this->append(
\MailSo\Mime\Email::Parse(\substr($sWorkingRecipients, $iEmailStartPos, $iEmailEndPos - $iEmailStartPos))
);
@ -194,7 +188,7 @@ class EmailCollection extends \MailSo\Base\Collection
{
try
{
$this->Add(
$this->append(
\MailSo\Mime\Email::Parse(\substr($sWorkingRecipients, $iEmailStartPos, $iCurrentPos - $iEmailStartPos))
);
}