test de déploiment

WEB/Config/Config.php

@@ -14,7 +14,7 @@ $rep = __DIR__ . '/../';
 // $password = 'p';
 
 // SQULITE3
-$dsn = './Model/scripted.db'; 
+$dsn = './scripted.db'; 
 
 //Sel de hashage
 $sel = "JeSuisUnSeldeHashageEtJeSuisUniqueEtTresSecuriseEtJeSuisTresLong";

WEB/Controller/FrontController.php

@@ -6,6 +6,7 @@ class FrontController
         try { 
             global $error, $view, $rep;
             session_start();
+            echo "front controller";
             // Check role permissions
             if (isset($_SESSION['role'])) {
                 $role = $_SESSION['role'];

WEB/Controller/VisitorController.php

@@ -7,6 +7,7 @@ class VisitorController
     function __construct()
     {
         try {
+            echo "Visitor controller";
             global $dsn, $rep, $vues, $error;
             $model = new VisitorModel();
             $action = $_REQUEST['action'];

WEB/Model/UserModel.php

@@ -153,7 +153,6 @@ class UserModel
         //trigger_event('add_to_queue',$userGroup);
     }
 
-<<<<<<< HEAD
     public function AddUserToQueueEvent(){
         $userGroup=$this->utilisateur_gateway->findUsersInQueue();
         if($userGroup.count()>=4)
@@ -162,8 +161,6 @@ class UserModel
         }
     }
 
-=======
->>>>>>> 146a4b62fc5bc2340e9c08c07650a6efb799c3fb
     public function logout()
     {
         $_SESSION['role'] = 'visitor';

WEB/index.php

@@ -3,7 +3,9 @@ require_once('./Config/Config.php');
 require_once('./Config/Autoload.php');
 Autoload::charger();
 
+echo "test1";
 $control = new FrontController();
+echo "test2";
 
 //session_regenerate_id(true);
 // session_unset();