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

@ -18,14 +18,14 @@ class ClientException extends Exception
*/
private $sAdditionalMessage;
public function __construct(int $iCode, ?\Exception $oPrevious = null, string $sAdditionalMessage = '', bool $bLogoutOnException = false)
public function __construct(int $iCode, ?\Throwable $oPrevious = null, string $sAdditionalMessage = '', bool $bLogoutOnException = false)
{
parent::__construct(\RainLoop\Notifications::GetNotificationsMessage($iCode, $oPrevious),
$iCode, $oPrevious);
$this->sAdditionalMessage = $sAdditionalMessage;
$this->setLogoutOnException($bLogoutOnException);
$this->bLogoutOnException = $bLogoutOnException;
}
public function getAdditionalMessage() : string
@ -40,7 +40,7 @@ class ClientException extends Exception
public function setLogoutOnException(bool $bLogoutOnException, string $sAdditionalLogoutMessage = '') : self
{
$this->bLogoutOnException = !!$bLogoutOnException;
$this->bLogoutOnException = $bLogoutOnException;
$this->sAdditionalMessage = $sAdditionalLogoutMessage;