Bugfixes and more conversions to PHP 7

This commit is contained in:
djmaze 2020-03-10 18:45:00 +01:00
parent 2cada68f41
commit 3a7ec4ecb0
100 changed files with 238 additions and 992 deletions

View file

@ -157,10 +157,8 @@ class FolderCollection extends \MailSo\Base\Collection
/**
* @param array $aUnsortedMailFolders
*
* @return void
*/
public function InitByUnsortedMailFolderArray($aUnsortedMailFolders)
public function InitByUnsortedMailFolderArray($aUnsortedMailFolders) : void
{
$this->Clear();
@ -256,10 +254,8 @@ class FolderCollection extends \MailSo\Base\Collection
/**
* @param callable $fCallback
*
* @return void
*/
public function SortByCallback($fCallback)
public function SortByCallback($fCallback) : void
{
if (\is_callable($fCallback))
{

View file

@ -711,11 +711,9 @@ class MailClient
* @param int $iUnseenCount
* @param string $sUidNext
* @param string $sHighestModSeq
*
* @return void
*/
protected function initFolderValues($sFolderName, &$iCount, &$iUnseenCount,
&$sUidNext, &$sHighestModSeq = '')
&$sUidNext, &$sHighestModSeq = '') : void
{
$aTypes = array(
\MailSo\Imap\Enumerations\FolderResponseStatus::MESSAGES,
@ -1850,7 +1848,7 @@ class MailClient
if (!\is_array($aResultUids))
{
$aResultUids = $bUseSortIfSupported ?
$this->oImapClient->MessageSimpleSort(array('REVERSE ARRIVAL'), $sSearchCriterias, true) :
$this->oImapClient->MessageSimpleSort(array('REVERSE DATE'), $sSearchCriterias, true) :
$this->oImapClient->MessageSimpleSearch($sSearchCriterias, true, \MailSo\Base\Utils::IsAscii($sSearchCriterias) ? '' : 'UTF-8')
;

View file

@ -95,10 +95,7 @@ class MessageCollection extends \MailSo\Base\Collection
return new self();
}
/**
* @return \MailSo\Mail\MessageCollection
*/
public function Clear()
public function Clear() : void
{
parent::Clear();
@ -117,7 +114,5 @@ class MessageCollection extends \MailSo\Base\Collection
$this->NewMessages = array();
$this->Filtered = false;
return $this;
}
}