From 4becb885096dd56116d18ab5cac2ed9e81d6b09e Mon Sep 17 00:00:00 2001
From: Antoine Jourdain <antoine.jourdain@etu.uca.fr>
Date: Wed, 25 Oct 2023 10:31:50 +0200
Subject: [PATCH] MAJ Global V2

---
 Project/php/composer.json               | 2 +-
 Project/php/{modeles => model}/User.php | 2 +-
 Project/php/model/Vocabulaire.php       | 8 ++++----
 Project/php/modeles/Group.php           | 7 -------
 4 files changed, 6 insertions(+), 13 deletions(-)
 rename Project/php/{modeles => model}/User.php (97%)
 delete mode 100644 Project/php/modeles/Group.php

diff --git a/Project/php/composer.json b/Project/php/composer.json
index de876b8..05b57b9 100644
--- a/Project/php/composer.json
+++ b/Project/php/composer.json
@@ -6,7 +6,7 @@
     "psr-4": {
       "controleur\\": "controleur/",
       "config\\": "config/",
-      "modeles\\": "modeles/"
+      "model\\": "model/"
     }
   }
 }
diff --git a/Project/php/modeles/User.php b/Project/php/model/User.php
similarity index 97%
rename from Project/php/modeles/User.php
rename to Project/php/model/User.php
index 6d7a787..3ff7ab7 100755
--- a/Project/php/modeles/User.php
+++ b/Project/php/model/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace modeles;
+namespace model;
 
 class User
 {
diff --git a/Project/php/model/Vocabulaire.php b/Project/php/model/Vocabulaire.php
index d5660e8..b173db8 100755
--- a/Project/php/model/Vocabulaire.php
+++ b/Project/php/model/Vocabulaire.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Vocabulary;
+namespace model;
 
 class Vocabulary
 {
-    protected frozen String $id;
+    frozen protected String $id;
     protected String $nom;
     protected Picture $picture;
-    protected frozen User $creator;
+    frozen protected User $creator;
 
-    public function __construct(string $id, string $nom, picture $picture, user $creator)
+    public function __construct(string $id, string $nom, Picture $picture, user $creator)
     {
         $this->id = $id;
         $this->nom = $nom;
diff --git a/Project/php/modeles/Group.php b/Project/php/modeles/Group.php
deleted file mode 100644
index ecaf773..0000000
--- a/Project/php/modeles/Group.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace modeles;
-
-class Group
-{
-
-}
\ No newline at end of file