Merge remote-tracking branch 'origin/master' into track-address-reference-update

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -523,12 +523,12 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Update the ref status
      *
-<<<<<<< HEAD
+     * <<<<<<< HEAD
      * @param Address::ADDR_REFERENCE_STATUS_* $refStatus
      * @param bool|null $updateLastUpdate Also update the "refStatusLastUpdate"
-=======
+     * =======
      * The refstatuslast update is also updated
->>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
+     * >>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
      */
     public function setRefStatus(string $refStatus, ?bool $updateLastUpdate = true): self
     {

src/Bundle/ChillMainBundle/Entity/Country.php

@@ -43,36 +43,20 @@ class Country
     private ?int $id = null;
 
     /**
-     * @var string
+     * @var array<string, string>
      *
      * @ORM\Column(type="json")
      * @groups({"read", "docgen:read"})
      * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
-    private $name;
+    private array $name = [];
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * @return the string
-     */
-    public function getCountryCode()
+    public function getCountryCode(): string
     {
         return $this->countryCode;
     }
 
-    /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }
@@ -80,31 +64,23 @@ class Country
     /**
      * Get name.
      *
-     * @return string
      */
-    public function getName()
+    public function getName(): array
     {
         return $this->name;
     }
 
-    /**
-     * @param string $countryCode
-     */
-    public function setCountryCode($countryCode)
+    public function setCountryCode(?string $countryCode): self
     {
-        $this->countryCode = $countryCode;
+        $this->countryCode = (string) $countryCode;
 
         return $this;
     }
 
     /**
-     * Set name.
-     *
-     * @param string $name
-     *
-     * @return Country
+     * @param array<string, string> $name
      */
-    public function setName($name)
+    public function setName(array $name): self
     {
         $this->name = $name;
 

src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php

@@ -51,10 +51,7 @@ class CommentEmbeddable
         return $this->date;
     }
 
-    /**
-     * @return interger $userId
-     */
-    public function getUserId()
+    public function getUserId(): ?int
     {
         return $this->userId;
     }

src/Bundle/ChillMainBundle/Entity/NotificationComment.php

@@ -17,6 +17,7 @@ use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
+use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -133,7 +134,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
     /**
      * @ORM\PrePersist
      */
-    public function onPrePersist(LifecycleEventArgs $eventArgs): void
+    public function onPrePersist(PrePersistEventArgs $eventArgs): void
     {
         $this->recentlyPersisted = true;
     }

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -348,6 +348,23 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         return $this->transitionningStep;
     }
 
+    /**
+     * @return User[]
+     */
+    public function getUsersInvolved(): array
+    {
+        $usersInvolved = [];
+        $usersInvolved[spl_object_hash($this->getCreatedBy())] = $this->getCreatedBy();
+
+        foreach ($this->steps as $step) {
+            foreach ($step->getDestUser() as $u) {
+                $usersInvolved[spl_object_hash($u)] = $u;
+            }
+        }
+
+        return $usersInvolved;
+    }
+
     public function getWorkflowName(): string
     {
         return $this->workflowName;