entités remises à plat

src/Entity/Commentaire.php

@@ -13,27 +13,28 @@ class Commentaire
     #[ORM\Id]
     #[ORM\GeneratedValue(strategy: "AUTO")]
 
-    private $id;
+    private ?int $id = null;
 
     #[ORM\Column(name: "contenu", type: "text", length: 191, nullable: true)]
-    private $contenu;
+    
+    private ?string $contenu = null;
 
     #[ORM\Column(name: "note", type: "integer", nullable: true)]
 
-    private $note;
+    private ?int $note = null;
 
     #[ORM\ManyToOne(targetEntity: Film::class, inversedBy: "commentaires")]
     #[ORM\JoinColumn(nullable: false)]
 
-    private $film;
+    private ?Film $film = null;
 
     #[ORM\ManyToOne(targetEntity: User::class)]
     #[ORM\JoinColumn(nullable: false)]
 
-    private $user;
+    private ?User $user = null;
 
     #[ORM\Column(type: "datetime", nullable: true)]
-    private $dateSubmitted;
+    private ?\DateTimeInterface $dateSubmitted = null;
 
     public function __construct ()
     {
@@ -45,7 +46,7 @@ class Commentaire
         return $this->id;
     }
 
-    public function setContenu($contenu): self
+    public function setContenu(?string $contenu): self
     {
         $this->contenu = $contenu;
 
@@ -62,33 +63,33 @@ class Commentaire
         return $this->note;
     }
 
-    public function setNote($note): self
+    public function setNote(?int $note): self
     {
         $this->note = $note;
 
         return $this;
     }
 
-    public function setFilm(\App\Entity\Film $film): self
+    public function setFilm(?Film $film): self
     {
         $this->film = $film;
 
         return $this;
     }
 
-    public function getFilm(): Film
+    public function getFilm(): ?Film
     {
         return $this->film;
     }
 
-    public function setUser(\App\Entity\User $user): self
+    public function setUser(?User $user): self
     {
         $this->user = $user;
 
         return $this;
     }
 
-    public function getUser(): User
+    public function getUser(): ?User
     {
         return $this->user;
     }

src/Entity/Film.php

@@ -14,58 +14,74 @@ class Film
     #[ORM\Column(name: "id", type: "integer")]
     #[ORM\Id]
     #[ORM\GeneratedValue(strategy: "AUTO")]
-    private $id;
+    
+    private ?int $id = null;
 
     #[ORM\Column(name: "titre", type: "string", length: 191)]
-    private $titre;
+    
+    private ?string $titre = null;
 
     #[ORM\Column(name: "annee", type: "date", nullable: true)]
-    private $annee;
+    
+    private ?\DateTimeInterface $annee = null;
 
     #[ORM\Column(name: "date_submited", type: "datetime", nullable: true)]
-    private $dateSubmited;
+    
+    private ?\DateTimeInterface $dateSubmited = null;
 
     #[ORM\Column(name: "lien", type: "string", length: 191, nullable: true)]
     #[Assert\Url()]
-    private $lien;
+    
+    private ?string $lien = null;
 
     #[ORM\Column(name: "note", type: "float", nullable: true)]
-    private $note;
+    
+    private ?float $note = null;
 
     #[ORM\Column(name: "nb_coms", type: "integer", nullable: true)]
-    private $nbComs;
+    
+    private ?int $nbComs = null;
 
     #[Assert\Valid()]
     #[ORM\OneToOne(targetEntity: MediaVideo::class, cascade: ["persist","remove"])]
     #[ORM\JoinColumn(nullable: true)]
-    private $mediaVideo;
+    
+    private ?MediaVideo $mediaVideo = null;
 
     #[ORM\ManyToMany(targetEntity: Realisateur::class, inversedBy: "films", cascade: ["persist"])]
-    private $realisateurs;
+    
+    private ?Collection $realisateurs = null;
 
     #[ORM\OneToMany(targetEntity: Commentaire::class, mappedBy: "film", orphanRemoval: true)]
-    private $commentaires;
+    
+    private ?Collection $commentaires = null;
 
     #[ORM\ManyToOne(targetEntity: User::class)]
     #[ORM\JoinColumn(nullable: true)]
-    private $authered;
+    
+    private ?User $authered = null;
 
     #[ORM\ManyToMany(targetEntity: User::class, inversedBy: "films")]
     #[ORM\JoinTable(name: "filmsavoir_users")]
-    private $usersWantToView;
+    
+    private ?Collection $usersWantToView = null;
 
     #[ORM\ManyToMany(targetEntity: User::class, inversedBy: "filmsVus")]
     #[ORM\JoinTable(name: "filmsvus_users")]
-    private $usersWhoSeen;
+    
+    private ?Collection $usersWhoSeen = null;
 
     #[ORM\ManyToMany(targetEntity: Genre::class, cascade: ["persist"])]
-    private $genres;
+    
+    private ?Collection $genres = null;
 
     #[ORM\Column(type: "text", nullable: true)]
-    private $information;
+    
+    private ?string $information = null;
 
     #[ORM\Column(type: "date", nullable: true)]
-    private $dateSortie;
+    
+    private ?\DateTimeInterface $dateSortie = null;
 
     public function __construct()
     {
@@ -94,14 +110,14 @@ class Film
         return $this->id;
     }
 
-    public function setTitre($titre): self
+    public function setTitre(?string $titre): self
     {
         $this->titre = $titre;
 
         return $this;
     }
 
-    public function getTitre(): string
+    public function getTitre(): ?string
     {
         return $this->titre;
     }
@@ -135,27 +151,27 @@ class Film
         return $this->dateSubmited;
     }
 
-    public function setDateSubmited(?\DateTime $dateSubmited): self
+    public function setDateSubmited(?\DateTimeInterface $dateSubmited): self
     {
         $this->dateSubmited = $dateSubmited;
 
         return $this;
     }
 
-    public function isNew(): bool
+    public function isNew(): ?bool
     {
         $finNew = (new \DateTime($this->getDateSubmited()->format("Y/m/d")))->modify('+1 day');
         return (new \DateTime('now') < $finNew);
     }
 
-    public function addCommentaire(\App\Entity\Commentaire $commentaire): self
+    public function addCommentaire(Commentaire $commentaire): self
     {
         $this->commentaires[] = $commentaire;
 
         return $this;
     }
 
-    public function removeCommentaire(\App\Entity\Commentaire $commentaire): self
+    public function removeCommentaire(Commentaire $commentaire): self
     {
         $this->commentaires->removeElement($commentaire);
 
@@ -250,7 +266,7 @@ class Film
         return $this->note;
     }
 
-    public function setNote($note): self
+    public function setNote(?float $note): self
     {
         $this->note = $note;
 
@@ -262,7 +278,7 @@ class Film
         return $this->nbComs;
     }
 
-    public function setNbComs($nbComs): self
+    public function setNbComs(?int $nbComs): self
     {
         $this->nbComs = $nbComs;
 

src/Entity/Genre.php

@@ -13,24 +13,26 @@ class Genre
     #[ORM\Column(name: "id", type: "integer")]
     #[ORM\Id]
     #[ORM\GeneratedValue(strategy: "AUTO")]
-    private $id;
+    
+    private ?int $id = null;
 
     #[ORM\Column(name: "name", type: "string", length: 191, unique: true)]
-    private $name;
+    
+    private ?string $name = null;
 
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function setName($name): self
+    public function setName(?string $name): self
     {
         $this->name = $name;
 
         return $this;
     }
 
-    public function getName(): string
+    public function getName(): ?string
     {
         return $this->name;
     }

src/Entity/MediaVideo.php

@@ -12,25 +12,19 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 class MediaVideo
 {
-    
-
     #[ORM\Column(name: "id", type: "integer")]
     #[ORM\Id]
     #[ORM\GeneratedValue(strategy: "AUTO")]
     
-    private $id;
-
-    
+    private ?int $id = null;
 
     #[ORM\Column(name: "type", type: "string", length: 191)]
     
-    private $type;
-
-    
+    private ?string $type = null;
 
     #[ORM\Column(name: "identif", type: "string", length: 191)]
     
-    private $identif;
+    private ?string $identif = null;
 
     #[Assert\Regex(
         pattern: "#^(http|https)://(youtu.be|www.youtube.com|www.dailymotion.com|vimeo.com|video.fdlibre.eu)/#",
@@ -38,7 +32,7 @@ class MediaVideo
         message: "L'url doit correspondre à l'url d'une vidéo Youtube, DailyMotion, Vimeo ou Peertube(fdlibre)"
     )]
     
-    private $url;
+    private ?string $url = null;
 
     public function setFromTmdb(string $type, string $identif): void
     {
@@ -56,7 +50,7 @@ class MediaVideo
         return $this->url();
     }
 
-    public function setUrl(string $url): self
+    public function setUrl(?string $url): self
     {
         $this->url = $url;
         $this->extractIdentif();
@@ -64,7 +58,7 @@ class MediaVideo
         return $this;
     }
     
-    public function setType(string $type): self
+    public function setType(?string $type): self
     {
         $this->type = $type;
 
@@ -76,7 +70,7 @@ class MediaVideo
         return $this->type;
     }
     
-    public function setIdentif(string $identif): self
+    public function setIdentif(?string $identif): self
     {
         $this->identif = $identif;
 
@@ -90,7 +84,7 @@ class MediaVideo
 
     /////////////////////
     // Méthodes
-    private function peertubeId($url): void
+    private function peertubeId(string $url): void
     {
         $tableau = explode("/", $url);
         $id = $tableau[count($tableau)-1];
@@ -98,7 +92,7 @@ class MediaVideo
         $this->setType('peertube');
     }
     
-    private function youtubeId($url): void
+    private function youtubeId(string $url): void
     {
         $tableaux = explode("=", $url);  // découpe l’url en deux  avec le signe ‘=’
 
@@ -106,7 +100,7 @@ class MediaVideo
         $this->setType('youtube');  // signale qu’il s’agit d’une video youtube et l’inscrit dans l’attribut $type
     }
 
-    private function youtubeCourteId($url): void
+    private function youtubeCourteId(string $url): void
     {
         $tableaux = explode("/", $url);  // on découpe l’url grâce au « / »
         $id = $tableaux[count($tableaux)-1];  // on retient la dernière partie qui contient l’identifiant
@@ -114,7 +108,7 @@ class MediaVideo
         $this->setType('youtube');  // signale qu’il s’agit d’une video youtube et l’inscrit dans l’attribut $type
     }
 
-    private function dailymotionId($url): void
+    private function dailymotionId(string $url): void
     {
         $cas = explode("/", $url); // On sépare la première partie de l'url des 2 autres
         $idb = $cas[4];  // On récupère la partie qui nous intéressent
@@ -125,7 +119,7 @@ class MediaVideo
         $this->setType('dailymotion'); // signale qu’il s’agit d’une video dailymotion et l’inscrit dans l’attribut $type
     }
 
-    private function vimeoId($url): void
+    private function vimeoId(string $url): void
     {
         $tableaux = explode("/", $url);  // on découpe l’url grâce au « / »
         $id = $tableaux[count($tableaux)-1];  // on reticent la dernière partie qui contient l’identifiant

src/Entity/Profile.php

@@ -15,18 +15,18 @@ class Profile
     #[ORM\GeneratedValue]
     #[ORM\Column(type: "integer")]
 
-    private $id;
+    private ?int $id = null;
 
 
     #[ORM\OneToOne(targetEntity: User::class, inversedBy: "profile", cascade: ["persist", "remove"])]
     #[ORM\JoinColumn(nullable: false)]
 
-    private $user;
+    private ?User $user = null;
 
 
     #[ORM\Column(type: "integer")]
 
-    private $view;
+    private ?int $view = null;
 
     public function __construct()
     {
@@ -43,7 +43,7 @@ class Profile
         return $this->user;
     }
 
-    public function setUser(User $user): self
+    public function setUser(?User $user): self
     {
         $this->user = $user;
 
@@ -55,7 +55,7 @@ class Profile
         return $this->view;
     }
 
-    public function setView(int $view): self
+    public function setView(?int $view): self
     {
         $this->view = $view;
 

src/Entity/Realisateur.php

@@ -15,13 +15,16 @@ class Realisateur
     #[ORM\Column(name: "id", type: "integer")]
     #[ORM\Id]
     #[ORM\GeneratedValue(strategy: "AUTO")]
-    private $id;
+    
+    private ?int $id = null;
 
     #[ORM\Column(name: "nom_complet", type: "string", length: 191, unique: true)]
-    private $nomComplet;
+    
+    private ?string $nomComplet = null;
 
     #[ORM\ManyToMany(targetEntity: Film::class, mappedBy: "realisateurs", cascade: ["persist"])]
-    private $films;
+    
+    private ?Collection $films = null;
 
     public function getId(): ?int
     {
@@ -33,14 +36,14 @@ class Realisateur
         $this->films = new \Doctrine\Common\Collections\ArrayCollection();
     }
 
-    public function addFilm(\App\Entity\Film $film): self
+    public function addFilm(Film $film): self
     {
         $this->films[] = $film;
 
         return $this;
     }
 
-    public function removeFilm(\App\Entity\Film $film): self
+    public function removeFilm(Film $film): self
     {
         $this->films->removeElement($film);
 
@@ -57,7 +60,7 @@ class Realisateur
         return $this->nomComplet;
     }
 
-    public function setNomComplet($nom): self
+    public function setNomComplet(?string $nom): self
     {
         $this->nomComplet = $nom;
 

src/Entity/User.php

@@ -22,53 +22,53 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
     #[ORM\Column(name: "id", type: "integer")]
     #[ORM\Id]
     #[ORM\GeneratedValue(strategy: "AUTO")]
-    private $id;
+    private ?int $id = null;
 
     #[ORM\Column(name: "username", type: "string", length: 191, unique: true)]
-    private $username;
+    private ?string $username = null;
 
     #[ORM\Column(name: "prenom", type: "string", length: 191, nullable: true)]
-    private $prenom;
+    private ?string $prenom = null;
 
     #[ORM\Column(name: "nom", type: "string", length: 191, nullable: true)]
-    private $nom;
+    private ?string $nom = null;
 
     #[ORM\Column(name: "mail", type: "string", length: 191, unique: true)]
     #[Assert\Email()]
-    private $mail;
+    private ?string $mail = null;
 
     #[ORM\Column(name: "password", type: "string", length: 191)]
-    private $password;
+    private ?string $password = null;
 
     #[ORM\Column(name: "token", type: "string", length: 191, unique: true)]
 
-    private $token;
+    private ?string $token = null;
 
     #[ORM\Column(name: "token_validity", type: "datetime")]
     #[Assert\Type("DateTime")]
-    private $tokenValidity;
+    private ?\DateTimeInterface $tokenValidity = null;
 
     #[ORM\Column(name: "salt", type: "string", length: 191, nullable: true)]
-    private $salt;
+    private ?string $salt = null;
 
     #[ORM\Column(name: "is_active", type: "boolean")]
-    private $isActive;
+    private ?bool $isActive = null;
 
     #[ORM\Column(name: "roles", type: "array")]
-    private $roles = array();
+    private ?array $roles = array();
 
     #[ORM\ManyToMany(targetEntity: Film::class, mappedBy: "usersWantToView")]
-    private $films;
+    private ?Collection $films = null;
 
     #[ORM\ManyToMany(targetEntity: Film::class, mappedBy: "usersWhoSeen")]
-    private $filmsVus;
+    private ?Collection $filmsVus = null;
 
     #[ORM\OneToOne(targetEntity: Profile::class, mappedBy: "user", cascade: ["persist", "remove"])]
-    private $profile;
+    private ?Profile $profile = null;
 
     #[ORM\Column(name: "last_activity", type: "datetime")]
     #[Assert\Type("DateTime")]
-    private $lastActivity;
+    private ?\DateTimeInterface $lastActivity = null;
 
     public function getLastActivity(): ?\DateTimeInterface
     {
@@ -82,7 +82,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this;
     }
 
-    public function isActiveNow(): bool
+    public function isActiveNow(): ?bool
     {
         $delay = new \DateTime('5 minutes ago');
 
@@ -94,7 +94,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->id;
     }
 
-    public function setUsername($username): self
+    public function setUsername(?string $username): self
     {
         $this->username = $username;
 
@@ -111,14 +111,14 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->username;
     }
 
-    public function setActivated($activated): self
+    public function setActivated(?bool $activated): self
     {
         $this->isActive = $activated;
 
         return $this;
     }
 
-    public function getActivated(): bool
+    public function getActivated(): ?bool
     {
         return $this->isActive;
     }
@@ -128,7 +128,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->prenom;
     }
 
-    public function setPrenom($prenom): self
+    public function setPrenom(?string $prenom): self
     {
         $this->prenom = $prenom;
 
@@ -140,7 +140,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->nom;
     }
 
-    public function setNom($nom): self
+    public function setNom(?string $nom): self
     {
         $this->nom = $nom;
 
@@ -152,14 +152,14 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->mail;
     }
 
-    public function setMail($mail): self
+    public function setMail(?string $mail): self
     {
         $this->mail = $mail;
 
         return $this;
     }
 
-    public function setPassword($password): self
+    public function setPassword(?string $password): self
     {
         $this->password = $password;
 
@@ -171,7 +171,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->password;
     }
 
-    public function setSalt($salt): self
+    public function setSalt(?string $salt): self
     {
         $this->salt = $salt;
 
@@ -188,7 +188,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->token;
     }
 
-    public function setToken($token): self
+    public function setToken(?string $token): self
     {
         //$this->token = hash("sha512", uniqid());
         $this->token = $token;
@@ -202,14 +202,14 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->tokenValidity;
     }
 
-    private function setTokenValidity(\DateTimeInterface $tokenValidity): self
+    private function setTokenValidity(?\DateTimeInterface $tokenValidity): self
     {
         $this->tokenValidity = $tokenValidity;
 
         return $this;
     }
 
-    public function isValidToken(): bool
+    public function isValidToken(): ?bool
     {
         $expire = (new \DateTime($this->getTokenValidity()->format("Y-m-d H:i:s")))->modify('+1 hour');
         dump($expire);
@@ -217,7 +217,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return ( $expire > new \DateTime('now') );
     }
 
-    public function setRoles($roles): self
+    public function setRoles(?array $roles): self
     {
         $this->roles = $roles;
 
@@ -227,7 +227,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
     /**
      * @see UserInterface
      */
-    public function getRoles(): array
+    public function getRoles(): ?array
     {
         $roles = $this->roles;
         return array_unique($roles);
@@ -249,14 +249,14 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
 
     ///////////////////////////////////////////////////////////////
    
-    public function addFilm(\App\Entity\Film $film): self
+    public function addFilm(Film $film): self
     {
         $this->films[] = $film;
 
         return $this;
     }
 
-    public function removeFilm(\App\Entity\Film $film): self
+    public function removeFilm(Film $film): self
     {
         $this->films->removeElement($film);
 
@@ -270,14 +270,14 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
 
     ///////////////////////////////////////////////////////////////////////////
 
-    public function addFilmVu(\App\Entity\Film $film): self
+    public function addFilmVu(Film $film): self
     {
         $this->filmsVus[] = $film;
 
         return $this;
     }
 
-    public function removeFilmVu(\App\Entity\Film $film): self
+    public function removeFilmVu(Film $film): self
     {
         $this->filmsVus->removeElement($film);
 
@@ -298,22 +298,22 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->getPrenom()." ".$this->getNom();
     }
 
-    public function isAccountNonExpired(): bool
+    public function isAccountNonExpired(): ?bool
     {
         return true;
     }
 
-    public function isAccountNonLocked(): bool
+    public function isAccountNonLocked(): ?bool
     {
         return true;
     }
 
-    public function isCredentialsNonExpired(): bool
+    public function isCredentialsNonExpired(): ?bool
     {
         return true;
     }
 
-    public function isEnabled(): bool
+    public function isEnabled(): ?bool
     {
         return $this->isActive;
     }
@@ -330,7 +330,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         ));
     }
 
-    public function unserialize($serialized):void 
+    public function unserialize(?string $serialized):void 
     {
         list (
             $this->id,
@@ -343,12 +343,12 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
             ) = unserialize($serialized, array('allowed_classes' => false));
     }
 
-    public function wantToSee(Film $film): bool
+    public function wantToSee(Film $film): ?bool
     {
         return $this->getFilms()->contains($film);
     }
 
-    public function haveSeen(Film $film): bool
+    public function haveSeen(Film $film): ?bool
     {
         return $this->getFilmsVus()->contains($film);
     }
@@ -358,7 +358,7 @@ class User implements UserInterface,PasswordAuthenticatedUserInterface
         return $this->profile;
     }
 
-    public function setProfile(Profile $profile): self
+    public function setProfile(?Profile $profile): self
     {
         // set the owning side of the relation if necessary
         if ($profile->getUser() !== $this) {