Cleanup some PHP namespaces

This commit is contained in:
djmaze 2020-07-29 12:41:45 +02:00
parent bc79a4f5b1
commit fa39c7ecba
3 changed files with 4 additions and 9 deletions

View file

@ -49,9 +49,8 @@ class Account
*/ */
private $sParentEmail; private $sParentEmail;
function __construct(string $sEmail, string $sLogin, string $sPassword, function __construct(string $sEmail, string $sLogin, string $sPassword, Domain $oDomain,
\RainLoop\Model\Domain $oDomain, string $sSignMeToken = '', string $sProxyAuthUser = '', string $sSignMeToken = '', string $sProxyAuthUser = '', string $sProxyAuthPassword = '', string $sClientCert = '')
string $sProxyAuthPassword = '', string $sClientCert = '')
{ {
$this->sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail, true); $this->sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail, true);
$this->sLogin = \MailSo\Base\Utils::IdnToAscii($sLogin); $this->sLogin = \MailSo\Base\Utils::IdnToAscii($sLogin);
@ -146,7 +145,7 @@ class Account
return $this->sSignMeToken; return $this->sSignMeToken;
} }
public function Domain() : \RainLoop\Model\Domain public function Domain() : Domain
{ {
return $this->oDomain; return $this->oDomain;
} }

View file

@ -128,7 +128,7 @@ class Domain
$this->sAliasName = ''; $this->sAliasName = '';
} }
public static function NewInstanceFromDomainConfigArray(string $sName, array $aDomain) : ?\RainLoop\Model\Domain public static function NewInstanceFromDomainConfigArray(string $sName, array $aDomain) : ?self
{ {
$oDomain = null; $oDomain = null;

View file

@ -4,10 +4,6 @@ namespace RainLoop\Plugins;
class Helper class Helper
{ {
function __construct()
{
}
static public function ValidateWildcardValues(string $sString, string $sWildcardValues, string &$sFoundedValue) : bool static public function ValidateWildcardValues(string $sString, string $sWildcardValues, string &$sFoundedValue) : bool
{ {
$sFoundedValue = ''; $sFoundedValue = '';