conflict resolved

This commit is contained in:
Olivier PARPAILLON
2024-11-19 10:39:22 +01:00
8 changed files with 29 additions and 108 deletions

View File

@@ -15,21 +15,21 @@ use Symfony\Component\Uid\Uuid;
class Participant implements UserInterface, PasswordAuthenticatedUserInterface
{
#[ORM\Id]
#[ORM\Column(type: 'uuid', unique: true)]
#[ORM\Column(type: 'guid', unique: true)]
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
private ?Uuid $idParticipant = null;
private ?string $idParticipant = null;
#[ORM\Column(length: 255)]
private ?string $nom = null;
#[ORM\Column(length: 255)]
private ?string $prénom = null;
private ?string $prenom = null;
#[ORM\Column(length: 255, nullable: true)]
private ?string $telephone = null;
#[ORM\Column(length: 255)]
#[ORM\Column(length: 255, nullable: false)]
private ?string $email = null;
#[ORM\Column]
@@ -56,11 +56,10 @@ class Participant implements UserInterface, PasswordAuthenticatedUserInterface
public function __construct()
{
$this->idParticipant = Uuid::v4(); // Génération automatique de l'UUID
$this->sorties = new ArrayCollection();
}
public function getIdParticipant(): ?Uuid
public function getIdParticipant(): ?string
{
return $this->idParticipant;
}
@@ -77,14 +76,14 @@ class Participant implements UserInterface, PasswordAuthenticatedUserInterface
return $this;
}
public function getPrénom(): ?string
public function getPrenom(): ?string
{
return $this->prénom;
return $this->prenom;
}
public function setPrénom(string $prénom): self
public function setPrenom(string $prenom): self
{
$this->prénom = $prénom;
$this->prenom = $prenom;
return $this;
}