Merge branch 'master' into calendar/docgen-add-generation

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -270,6 +270,8 @@ class AccompanyingPeriod implements
      */
     private ?Comment $pinnedComment = null;
 
+    private bool $preventUserIsChangedNotification = false;
+
     /**
      * @ORM\Column(type="text")
      * @Groups({"read", "write"})
@@ -1077,6 +1079,11 @@ class AccompanyingPeriod implements
         return false;
     }
 
+    public function isPreventUserIsChangedNotification(): bool
+    {
+        return $this->preventUserIsChangedNotification;
+    }
+
     public function isRequestorAnonymous(): bool
     {
         return $this->requestorAnonymous;
@@ -1372,11 +1379,12 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setUser(?User $user): self
+    public function setUser(?User $user, bool $preventNotification = false): self
     {
         if ($this->user !== $user) {
             $this->userPrevious = $this->user;
             $this->userIsChanged = true;
+            $this->preventUserIsChangedNotification = $preventNotification;
 
             foreach ($this->userHistories as $history) {
                 if (null === $history->getEndDate()) {

src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php

@@ -35,6 +35,11 @@ class MaritalStatus
      */
     private array $name;
 
+    public function __construct()
+    {
+        $this->id = substr(md5(uniqid()), 0, 7);
+    }
+
     /**
      * Get id.
      */

src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php

@@ -72,6 +72,9 @@ class Evaluation
         $this->socialActions = new ArrayCollection();
     }
 
+    /**
+     * @internal do use @see{SocialAction::addEvaluation}
+     */
     public function addSocialAction(SocialAction $socialAction): self
     {
         if (!$this->socialActions->contains($socialAction)) {
@@ -111,6 +114,11 @@ class Evaluation
         return $this->url;
     }
 
+    /**
+     * @return $this
+     *
+     * @internal do use @see{SocialAction::removeEvaluation}
+     */
     public function removeSocialAction(SocialAction $socialAction): self
     {
         if ($this->socialActions->contains($socialAction)) {

src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php

@@ -112,6 +112,7 @@ class SocialAction
     {
         if (!$this->evaluations->contains($evaluation)) {
             $this->evaluations[] = $evaluation;
+            $evaluation->addSocialAction($this);
         }
 
         return $this;
@@ -310,6 +311,7 @@ class SocialAction
     public function removeEvaluation(Evaluation $evaluation): self
     {
         $this->evaluations->removeElement($evaluation);
+        $evaluation->removeSocialAction($this);
 
         return $this;
     }