tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

User: Allow to unset an email and return $this in all setters 

$email is optional in the constructor and so should be when
calling its setter.
This commit is contained in:
Johannes Meyer 2017-07-31 15:21:54 +02:00
parent 7d177d8712
commit 22feb4b3fd
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
library/Icinga/User.php
View File

@ -143,10 +143,13 @@ class User
* Setter for preferences
*
* @param Preferences $preferences
*
* @return $this
*/
public function setPreferences(Preferences $preferences)
{
$this->preferences = $preferences;
return $this;
}
/**
@ -177,10 +180,13 @@ class User
* Set the groups this user belongs to
*
* @param array $groups
*
* @return $this
*/
public function setGroups(array $groups)
{
$this->groups = $groups;
return $this;
}
/**
@ -287,6 +293,8 @@ class User
* Setter for username
*
* @param string $name
*
* @return $this
*/
public function setUsername($name)
{
@ -302,6 +310,8 @@ class User
$this->domain = null;
}
}
return $this;
}
/**
@ -318,10 +328,13 @@ class User
* Setter for firstname
*
* @param string $name
*
* @return $this
*/
public function setFirstname($name)
{
$this->firstname = $name;
return $this;
}
/**
@ -338,10 +351,13 @@ class User
* Setter for lastname
*
* @param string $name
*
* @return $this
*/
public function setLastname($name)
{
$this->lastname = $name;
return $this;
}
/**
@ -359,15 +375,20 @@ class User
*
* @param string $mail
*
* @return $this
*
* @throws InvalidArgumentException When an invalid mail is provided
*/
public function setEmail($mail)
{
if (filter_var($mail, FILTER_VALIDATE_EMAIL)) {
$this->email = $mail;
} else {
throw new InvalidArgumentException('Invalid mail given for user ' . $this->getUsername() . ': $mail');
if ($mail !== null && !filter_var($mail, FILTER_VALIDATE_EMAIL)) {
throw new InvalidArgumentException(
sprintf('Invalid mail given for user %s: %s', $this->getUsername(), $mail)
);
}
$this->email = $mail;
return $this;
}
/**
@ -431,10 +452,13 @@ class User
*
* @param string $key
* @param string $value
*
* @return $this
*/
public function setAdditional($key, $value)
{
$this->additionalInformation[$key] = $value;
return $this;
}
/**
@ -474,10 +498,13 @@ class User
*
* @param string $username
* @param string $field
*
* @return $this
*/
public function setExternalUserInformation($username, $field)
{
$this->externalUserInformation = array($username, $field);
return $this;
}
/**