johanleroy/ENI-sortir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolved

Browse Source
This commit is contained in:
Olivier PARPAILLON
2024-11-19 11:18:10 +01:00
parent a2fe05a3ad 534fc0a9eb
commit a5bc958e78
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entity/Lieu.php
View File

@@ -35,7 +35,7 @@ class Lieu
private Collection $sorties; private Collection $sorties;
#[ORM\ManyToOne(inversedBy: 'lieux')] #[ORM\ManyToOne(inversedBy: 'lieux')]
#[ORM\JoinColumn(name: 'ville_id', referencedColumnName: 'idVille', nullable: false)] #[ORM\JoinColumn(name: 'id_ville', referencedColumnName: 'idVille', nullable: false)]
private ?Ville $ville = null; private ?Ville $ville = null;
public function __construct() public function __construct()

8
src/Entity/Sortie.php
View File

@@ -34,19 +34,19 @@ class Sortie
private ?string $infosSortie = null; private ?string $infosSortie = null;
#[ORM\ManyToOne(targetEntity: Site::class, inversedBy: 'sorties')] #[ORM\ManyToOne(targetEntity: Site::class, inversedBy: 'sorties')]
#[ORM\JoinColumn(name: 'site_id', referencedColumnName: 'idSite', nullable: false)] #[ORM\JoinColumn(name: 'id_site', referencedColumnName: 'idSite', nullable: false)]
private ?Site $site = null; private ?Site $site = null;
#[ORM\ManyToOne(targetEntity: Participant::class, inversedBy: 'sorties')] #[ORM\ManyToOne(targetEntity: Participant::class, inversedBy: 'sorties')]
#[ORM\JoinColumn(name: 'participant_id', referencedColumnName: 'idParticipant', nullable: false)] #[ORM\JoinColumn(name: 'id_participant', referencedColumnName: 'idParticipant', nullable: false)]
private ?Participant $participant = null; private ?Participant $participant = null;
#[ORM\ManyToOne(targetEntity: Lieu::class, inversedBy: 'sorties')] #[ORM\ManyToOne(targetEntity: Lieu::class, inversedBy: 'sorties')]
#[ORM\JoinColumn(name: 'lieu_id', referencedColumnName: 'idLieu', nullable: false)] #[ORM\JoinColumn(name: 'id_lieu', referencedColumnName: 'idLieu', nullable: false)]
private ?Lieu $lieu = null; private ?Lieu $lieu = null;
#[ORM\ManyToOne(targetEntity: Etat::class, inversedBy: 'sorties')] #[ORM\ManyToOne(targetEntity: Etat::class, inversedBy: 'sorties')]
#[ORM\JoinColumn(name: 'etat_id', referencedColumnName: 'idEtat', nullable: false)] #[ORM\JoinColumn(name: 'id_etat', referencedColumnName: 'idEtat', nullable: false)]
private ?Etat $etat = null; private ?Etat $etat = null;
public function getIdSortie(): ?string public function getIdSortie(): ?string