Merge remote-tracking branch 'origin/master' into calendar/synchro-msgraph

This commit is contained in:
2022-05-28 00:30:02 +02:00
295 changed files with 4720 additions and 1727 deletions

View File

@@ -47,6 +47,11 @@ class User implements AdvancedUserInterface
*/
private array $attributes = [];
/**
* @ORM\ManyToOne(targetEntity=Civility::class)
*/
private ?Civility $civility = null;
/**
* @ORM\ManyToOne(targetEntity=Location::class)
*/
@@ -184,6 +189,11 @@ class User implements AdvancedUserInterface
return $this->attributes;
}
public function getCivility(): ?Civility
{
return $this->civility;
}
public function getCurrentLocation(): ?Location
{
return $this->currentLocation;
@@ -361,6 +371,13 @@ class User implements AdvancedUserInterface
return $this;
}
public function setCivility(?Civility $civility): User
{
$this->civility = $civility;
return $this;
}
public function setCurrentLocation(?Location $currentLocation): User
{
$this->currentLocation = $currentLocation;