From dbe009f11f10e8ddca4ff2ad624d3e2a2a9008a4 Mon Sep 17 00:00:00 2001
From: unknown <lisa.deslandes@etu.unice.fr>
Date: Fri, 4 Dec 2020 03:19:36 +0100
Subject: [PATCH] Modification chemin

---
 php/{ => Classe}/Hystorique.php  |  0
 php/{ => Classe}/Joueur.php      |  0
 php/{ => Classe}/MeteoSpot.php   |  0
 php/{ => Classe}/MeteoVille.php  |  0
 php/{ => Classe}/Pointage.php    |  0
 php/{ => Classe}/Pollution.php   |  2 +-
 php/{ => Classe}/Produits.php    |  2 +-
 php/{ => Classe}/Spot.php        |  2 +-
 php/{ => Classe}/Utilisateur.php | 20 +++++++++++++++++++-
 php/{ => Classe}/Ville.php       |  2 +-
 10 files changed, 23 insertions(+), 5 deletions(-)
 rename php/{ => Classe}/Hystorique.php (100%)
 rename php/{ => Classe}/Joueur.php (100%)
 rename php/{ => Classe}/MeteoSpot.php (100%)
 rename php/{ => Classe}/MeteoVille.php (100%)
 rename php/{ => Classe}/Pointage.php (100%)
 rename php/{ => Classe}/Pollution.php (76%)
 rename php/{ => Classe}/Produits.php (88%)
 rename php/{ => Classe}/Spot.php (76%)
 rename php/{ => Classe}/Utilisateur.php (51%)
 rename php/{ => Classe}/Ville.php (76%)

diff --git a/php/Hystorique.php b/php/Classe/Hystorique.php
similarity index 100%
rename from php/Hystorique.php
rename to php/Classe/Hystorique.php
diff --git a/php/Joueur.php b/php/Classe/Joueur.php
similarity index 100%
rename from php/Joueur.php
rename to php/Classe/Joueur.php
diff --git a/php/MeteoSpot.php b/php/Classe/MeteoSpot.php
similarity index 100%
rename from php/MeteoSpot.php
rename to php/Classe/MeteoSpot.php
diff --git a/php/MeteoVille.php b/php/Classe/MeteoVille.php
similarity index 100%
rename from php/MeteoVille.php
rename to php/Classe/MeteoVille.php
diff --git a/php/Pointage.php b/php/Classe/Pointage.php
similarity index 100%
rename from php/Pointage.php
rename to php/Classe/Pointage.php
diff --git a/php/Pollution.php b/php/Classe/Pollution.php
similarity index 76%
rename from php/Pollution.php
rename to php/Classe/Pollution.php
index 3f5f3b2..3e4cbb8 100644
--- a/php/Pollution.php
+++ b/php/Classe/Pollution.php
@@ -7,7 +7,7 @@ class Pollution
     private int $niveauPollution;
     private string $description;
 
-    function __contruct(int $id,int $niveauPollution,string $description){
+    function __construct(int $id,int $niveauPollution,string $description){
         $this->id = $id;
         $this->niveauPollution = $niveauPollution;
         $this->description = $description;
diff --git a/php/Produits.php b/php/Classe/Produits.php
similarity index 88%
rename from php/Produits.php
rename to php/Classe/Produits.php
index 0d00976..efc4337 100644
--- a/php/Produits.php
+++ b/php/Classe/Produits.php
@@ -14,7 +14,7 @@ class Produits
     private bool $estPeinture;
     private string $autreProduit;
 
-    function __contruct(int $id,bool $estCremeSolaire,bool $estCremeParfum,bool $estCremeHydratante,bool $estMaquillage,
+    function __construct(int $id,bool $estCremeSolaire,bool $estCremeParfum,bool $estCremeHydratante,bool $estMaquillage,
                         bool $estEssence,bool $estCigarette,bool $estEngrais,bool $estPeinture,string $autreProduit){
         $this->id = $id;
         $this->estCremeSolaire = $estCremeSolaire;
diff --git a/php/Spot.php b/php/Classe/Spot.php
similarity index 76%
rename from php/Spot.php
rename to php/Classe/Spot.php
index 221cf40..8c3a819 100644
--- a/php/Spot.php
+++ b/php/Classe/Spot.php
@@ -9,7 +9,7 @@ class Spot
     private MeteoSpot $meteo;
     private Pollution $pollution;
 
-    function __contruct(int $id,string $nom,Ville $ville,Pollution $pollution,MeteoSpot $meteo){
+    function __construct(int $id,string $nom,Ville $ville,Pollution $pollution,MeteoSpot $meteo){
         $this->id = $id;
         $this->nom = $nom;
         $this->ville = $ville;
diff --git a/php/Utilisateur.php b/php/Classe/Utilisateur.php
similarity index 51%
rename from php/Utilisateur.php
rename to php/Classe/Utilisateur.php
index 2bd737e..8d3f99a 100644
--- a/php/Utilisateur.php
+++ b/php/Classe/Utilisateur.php
@@ -10,7 +10,7 @@ class Utilisateur
     private string $mail;
     private string $password;
 
-    function __contruct(int $id,string $nom,string $prenom,string $pseudo,string $mail,string $password){
+    function __construct(int $id,string $nom,string $prenom,string $pseudo,string $mail,string $password){
         $this->id = $id;
         $this->nom = $nom;
         $this->prenom = $prenom;
@@ -18,4 +18,22 @@ class Utilisateur
         $this->mail = $mail;
         $this->password = $password;
     }
+
+    /**
+     * @return string
+     */
+    public function getNom(): string
+    {
+        return $this->nom;
+    }
+
+    /**
+     * @param string $nom
+     */
+    public function setNom(string $nom): void
+    {
+        $this->nom = $nom;
+    }
+
+
 }
\ No newline at end of file
diff --git a/php/Ville.php b/php/Classe/Ville.php
similarity index 76%
rename from php/Ville.php
rename to php/Classe/Ville.php
index e7a1b2d..c5ac909 100644
--- a/php/Ville.php
+++ b/php/Classe/Ville.php
@@ -9,7 +9,7 @@ class Ville
     private int $temperature;
     private MeteoVille $meteo;
 
-    function __contruct(int $id,string $nom,string $codePostal,string $temperature,MeteoVille $meteo){
+    function __construct(int $id,string $nom,string $codePostal,string $temperature,MeteoVille $meteo){
         $this->id = $id;
         $this->nom = $nom;
         $this->codePostal = $codePostal;