Merge remote-tracking branch 'origin/master' into issue185_ACCent_createdBy_updatedBy

This commit is contained in:
2021-11-15 14:14:12 +01:00
88 changed files with 3487 additions and 357 deletions

View File

@@ -932,13 +932,19 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
* return gender as a Numeric form.
* This is used for translations
* @return int
* @deprecated Keep for legacy. Used in Chill 1.5 for feminize before icu translations
*/
public function getGenderNumeric()
{
if ($this->getGender() == self::FEMALE_GENDER) {
return 1;
} else {
return 0;
switch ($this->getGender()) {
case self::FEMALE_GENDER:
return 1;
case self::MALE_GENDER:
return 0;
case self::BOTH_GENDER:
return 2;
default:
return -1;
}
}
@@ -1177,9 +1183,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
* @param string $phonenumber
* @return Person
*/
public function setPhonenumber($phonenumber = '')
public function setPhonenumber(?string $phonenumber = '')
{
$this->phonenumber = $phonenumber;
$this->phonenumber = (string) $phonenumber;
return $this;
}
@@ -1200,9 +1206,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
* @param string $mobilenumber
* @return Person
*/
public function setMobilenumber($mobilenumber = '')
public function setMobilenumber(?string $mobilenumber = '')
{
$this->mobilenumber = $mobilenumber;
$this->mobilenumber = (string) $mobilenumber;
return $this;
}