Merge branch 'master' into user_absences

src/Bundle/ChillMainBundle/Entity/User.php

@@ -16,7 +16,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use RuntimeException;
-use Symfony\Component\Security\Core\User\AdvancedUserInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -32,7 +32,7 @@ use function in_array;
  *     "user": User::class
  * })
  */
-class User implements AdvancedUserInterface
+class User implements UserInterface
 {
     /**
      * @ORM\Id
@@ -64,8 +64,6 @@ class User implements AdvancedUserInterface
     private ?Location $currentLocation = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=150, nullable=true)
      */
     private ?string $email = null;
@@ -227,7 +225,7 @@ class User implements AdvancedUserInterface
     }
 
     /**
-     * @return GroupCenter
+     * @return Collection<GroupCenter>
      */
     public function getGroupCenters()
     {
@@ -236,10 +234,8 @@ class User implements AdvancedUserInterface
 
     /**
      * Get id.
-     *
-     * @return int
      */
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }
@@ -508,7 +504,7 @@ class User implements AdvancedUserInterface
      *
      * @param string $name
      *
-     * @return Agent
+     * @return User
      */
     public function setUsername($name)
     {