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

Bugfix: @param/@return documentation was incorrect which caused errors

Browse source
This commit is contained in:
djmaze 2020-03-16 15:48:58 +01:00
parent 7eb1defa16
commit b81b36d120
10 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -631,7 +631,7 @@ class Actions
/**
* @throws \RainLoop\Exceptions\ClientException
*/
public function GetAccount(bool $bThrowExceptionOnFalse = false) : \RainLoop\Model\Account
public function GetAccount(bool $bThrowExceptionOnFalse = false) : ?\RainLoop\Model\Account
{
return $this->getAccountFromToken($bThrowExceptionOnFalse);
}
@ -1082,9 +1082,9 @@ class Actions
/**
* @throws \RainLoop\Exceptions\ClientException
*/
public function GetAccountFromCustomToken(string $sToken, bool $bThrowExceptionOnFalse = true, bool $bValidateShortToken = true, bool $bQ = false) : \RainLoop\Model\Account
public function GetAccountFromCustomToken(string $sToken, bool $bThrowExceptionOnFalse = true, bool $bValidateShortToken = true, bool $bQ = false) : ?\RainLoop\Model\Account
{
$oResult = false;
$oResult = null;
if (!empty($sToken))
{
$aAccountHash = $bQ ? \RainLoop\Utils::DecodeKeyValuesQ($sToken) : \RainLoop\Utils::DecodeKeyValues($sToken);
@ -1127,9 +1127,9 @@ class Actions
return $oResult;
}
public function GetAccountFromSignMeToken() : \RainLoop\Model\Account
public function GetAccountFromSignMeToken() : ?\RainLoop\Model\Account
{
$oAccount = false;
$oAccount = null;
$sSignMeToken = \RainLoop\Utils::GetCookie(\RainLoop\Actions::AUTH_SIGN_ME_TOKEN_KEY, '');
if (!empty($sSignMeToken))
@ -1166,7 +1166,7 @@ class Actions
/**
* @throws \RainLoop\Exceptions\ClientException
*/
public function getAccountFromToken(bool $bThrowExceptionOnFalse = true) : \RainLoop\Model\Account
public function getAccountFromToken(bool $bThrowExceptionOnFalse = true) : ?\RainLoop\Model\Account
{
return $this->GetAccountFromCustomToken($this->getLocalAuthToken(), $bThrowExceptionOnFalse, true, true);
}
@ -1307,7 +1307,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
if (!$bAdmin)
{
$oAccount = $this->getAccountFromToken(false);
if ($oAccount instanceof \RainLoop\Model\Account)
if ($oAccount)
{
$aResult['IncludeCss'] = $aResult['UserCss'];