Merge branch 'php' of https://codefirst.iut.uca.fr/git/antoine.jourdain/SAE_2A_Anglais into php

merge

Project/php/controller/TeacherController.php

@@ -26,7 +26,7 @@ class TeacherController extends UserController
         $mdl->removeVocById($id);
         $this->affAllVocab();
     }
-    public function getContent(){
+    public function getContent():void{
         global $twig;
         global $user;
         $mdl = new MdlTeacher();

Project/php/gateway/GroupGateway.php

@@ -65,7 +65,7 @@ class GroupGateway extends AbsGateway
         }
     }
 
-    public function findById(int $id)
+    public function findById(int $id):array
     {
         try{
             $query = "SELECT * FROM Group_ WHERE id = :id";

Project/php/gateway/TranslationGateway.php

@@ -64,7 +64,7 @@ class TranslationGateway extends AbsGateway
         }
     }
 
-    public function findById(int $id)
+    public function findById(int $id): array
     {
         try {
             $query = "SELECT * FROM Translate WHERE id=:id";

Project/php/gateway/UserGateway.php

@@ -118,7 +118,7 @@ class UserGateway extends AbsGateway
         }
     }
 
-    public function findById(int $id)
+    public function findById(int $id): ?User
     {
         try {
             $query = "SELECT * FROM User_ WHERE id=:id";
@@ -160,7 +160,7 @@ class UserGateway extends AbsGateway
         }
     }
 
-    public function findUserByEmail(string $email): User{
+    public function findUserByEmail(string $email): ?User{
         try {
             $query = "SELECT * FROM User_ WHERE email=:email";
             $args = array(':email' => array($email, PDO::PARAM_STR));

Project/php/gateway/VocabularyListGateway.php

@@ -67,7 +67,7 @@ class VocabularyListGateway extends AbsGateway
         }
     }
 
-    public function findById(int $id)
+    public function findById(int $id) : ?VocabularyList
     {
         try{
             $query = "SELECT * FROM VocabularyList WHERE id = :id";

Project/php/model/AbsModel.php

@@ -6,7 +6,7 @@ use gateway\UserGateway;
 
 abstract class AbsModel
 {
-    public function connection(string $login, string $password){
+    public function connection(string $login, string $password):?User{
         $gtw = new UserGateway();
         $hash = $gtw->login($login) ?? null;
 
@@ -24,7 +24,7 @@ abstract class AbsModel
         return null;
     }
 
-    public function deconnection(){
+    public function deconnection():void{
         session_unset();
         session_destroy();
         $_SESSION = array();
@@ -35,5 +35,5 @@ abstract class AbsModel
         return $gtw->findUserByEmail($login) != null;
     }
 
-    public abstract function is(string $login, array $roles): User;
+    public abstract function is(string $login, array $roles): ?User;
 }

Project/php/model/MdlAdmin.php

@@ -67,7 +67,7 @@ class MdlAdmin extends MdlUser
         return $gtw->findUnassignedUsers();
     }
 
-    public function is(string $login, array $roles): User
+    public function is(string $login, array $roles): ?User
     {
         $gtw = new UserGateway();
         $user = $gtw->findUserByEmail($login);

Project/php/model/MdlStudent.php

@@ -19,7 +19,7 @@ class MdlStudent extends MdlUser
         return $res;
     }
 
-    public function is(string $login, array $roles): User
+    public function is(string $login, array $roles): ?User
     {
         $gtw = new UserGateway();
         $user = $gtw->findUserByEmail($login);

Project/php/model/MdlTeacher.php

@@ -76,7 +76,7 @@ class MdlTeacher extends MdlUser
         }
     }
 
-    public function is(string $login, array $roles): User
+    public function is(string $login, array $roles): ?User
     {
         $gtw = new UserGateway();
         $user = $gtw->findUserByEmail($login);

Project/php/model/MdlUser.php

@@ -16,7 +16,7 @@ class MdlUser extends AbsModel {
         $gtw->modifyPassword($id, $newPassword);
     }
 
-    public function is(string $login, array $roles): User
+    public function is(string $login, array $roles): ?User
     {
         $gtw = new UserGateway();
         $user = $gtw->findUserByEmail($login);