Update 'Sources/config/config.php'

.drone.yml

@@ -0,0 +1,90 @@
+kind: pipeline
+type: docker
+name: HeartWave
+
+trigger: 
+  event:
+    - push
+
+steps:
+  # Test ✔️
+  - name: test
+    image: composer:2.6
+    commands:
+      - cd Sources
+      - rm -r vendor
+      - rm composer.lock
+       # Installe les dépendances PHP si nécessaire
+      - php composer.phar install --no-interaction
+      - ./vendor/bin/phpunit tests
+
+  # Sonar static code analisis deployment
+  # TODO : use an image that already have unzip
+  - name: code-analysis
+    image: php:8.1-cli
+    environment:
+      SONAR_TOKEN:
+        from_secret: SONAR_TOKEN
+    commands:
+      - apt-get update && apt-get install -y curl unzip
+      - export SONAR_SCANNER_VERSION=4.7.0.2747
+      - export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
+      - curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
+      - unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+      - export PATH=$SONAR_SCANNER_HOME/bin:$PATH
+      - export SONAR_SCANNER_OPTS="-server"
+      - cd Sources
+      - sonar-scanner -D sonar.projectKey=HeartTrack -D sonar.host.url=https://codefirst.iut.uca.fr/sonar
+    depends_on: [ test ]
+  # build image and push on the registry ✔️ 
+  - name: rewrite-urls
+    image: 'busybox:latest'
+    commands:
+      - cd Sources
+      - ls
+      - >-
+        find . -type f -exec sed -i -r
+        "s@(href|src)=\"/@\1=\"$${PLUGIN_CONTAINER_PATH}@g" {} +                
+    settings:
+      container_path: https://codefirst.iut.uca.fr/containers/HeartDev-web/
+
+  - name: docker-build-and-push
+    image: plugins/docker
+    settings:
+      commands: ls
+      dockerfile: Sources/config/Dockerfile
+      context: Sources
+      registry: hub.codefirst.iut.uca.fr
+      repo: hub.codefirst.iut.uca.fr/david.d_almeida/web
+      mirror: https://proxy.iut.uca.fr:8443
+      username:
+        from_secret: SECRET_REGISTRY_USERNAME
+      password:
+        from_secret: SECRET_REGISTRY_PASSWORD
+    depends_on:
+      - rewrite-urls
+
+  - name: deploy-container
+    image: >-
+      hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment:
+      IMAGENAME: 'hub.codefirst.iut.uca.fr/david.d_almeida/web:latest'
+      CONTAINERNAME: web
+      COMMAND: create
+      OVERWRITE: true
+      ADMINS: david.d_almeida
+    depends_on:
+      - docker-build-and-push
+
+  - name: notify
+    image: ruby:2.1
+    when:
+      status: [ success ]
+      ref:
+        include:
+          - refs/tags/*-demo
+    commands:
+      - sh ./notifymail.sh
+    depends_on: [ docker-build-and-push ]
+
+

.gitignore

@@ -29,4 +29,4 @@ sftp-config.json
 sftp-config-alt*.json
 
 *.log*
-coverage/
+coverage/

Documents/Diagramme/BDD/README_BDD.md

@@ -4,23 +4,75 @@
 
 # BDD
 
+## Modèle Logique de Données (MLD)
+
+Le MLD représente la structure de données de l'application, décrivant les entités et les relations entre elles. Voici un aperçu des principales entités du MLD :
+
+### Athlète (Athlete)
+
+L'entité principale représentant un athlète avec ces informations propre à lui telles que l'identifiant, le nom, le prénom, l'email, etc. Les athlètes peuvent être coach avec le boolean idCoach et être liés par des amitiés, ou par un coaching via la table `Amitie`.
+
+### Amitié (Friendship)
+
+Une entité qui modélise les relations d'amitié entre les athlètes et de coaching entre les athlètes et les coachs. Elle stocke les identifiants des deux utilisateurs impliqués.
+
+### Notification (Notification)
+
+L'entité qui stocke les notifications destinées aux athlètes, avec des détails tels que le message, la date, le statut, et le degré d'urgence.
+
+### Envoi de Notification (SendNotification)
+
+Une entité de liaison entre les athlètes et les notifications, indiquant quel athlète ou coach a envoyé quelle notification. Cela peut-être utile lors d'une notification d'ajout d'amie par exemple.
+
+### Statistique (Statistic)
+
+Les statistiques relatives à un athlètes, y compris le poids, la fréquence cardiaque moyenne, la fréquence cardiaque maximale, etc.
+
+### Entraînement (Training)
+
+Détails sur les sessions d'entraînement planifiés par un coach pour ses athlètes, comprenant la date, la description, la localisation, etc. Les athlètes peuvent participer à des entraînements et donner leur feedback sur l'entrainement donné.
+
+### Participation (Participate)
+
+Une entité de liaison entre les athlètes et les entraînements, indiquant quels athlètes participent à quels entraînements.
+
+### Don (GiveParticipation)
+
+Une entité de liaison entre les coachs et les entraînements, indiquant quels coachs ont attribué quels entraînements.
+
+### Source de Données (DataSource)
+
+L'entité représentant la source des données des enregistrements sportif, telle que le type, le modèle, la précision, etc., utilisée par les athlètes pour enregistrer une ou des activités.
+
+### Activité (Activity)
+
+Les détails des activités des athlètes, y compris le type, la date, les heures de début et de fin, l'effort ressenti, etc.
+
+### Fréquence Cardiaque (HeartRate)
+
+Les données de fréquence cardiaque enregistrées pendant les activités, avec des informations telles que l'altitude, la température, etc.
+
+Ce MLD forme la base de données sous-jacente pour l'application, offrant une structure organisée pour stocker et récupérer les informations relatives aux athlètes et à leurs activités.
+
 ```plantuml
 @startuml
 skinparam classAttributeIconSize 0
 package MLD{
-entity "Athlète" as athlete {
+entity "Athlete" as athlete {
     {static} idAthlete
+    username
     nom
-    prénom
+    prenom
     email
     sexe
     taille
     poids
     motDePasse
     dateNaissance
+    isCoach
 }
 
-entity "Amitié" as friendship{
+entity "Amitie" as friendship{
 {static}# idAthlete1
 {static}# idAthlete2
 début
@@ -35,10 +87,9 @@ entity "Notification" as notif {
     #athleteId
 }
 
-entity "Coach" as coach {
+entity "Envoi" as sendNotif{
-    {static} idCoach
+{static}# idAthlete
-    // attributs spécifiques au coach
+{static}# idNotif
-    #athleteId
 }
 
 entity "Statistique" as stats {
@@ -46,20 +97,19 @@ entity "Statistique" as stats {
     poids
     fcMoyenne
     fcMax
-    caloriesBrûléesMoy
+    caloriesBruleesMoy
     date 
     #athleteId
 }
 
-entity "Entraînement" as training {
+entity "Entrainement" as training {
     {static} idEntrainement
     date
     description
-    // Exercices
     latitude
     longitude
     feedback
-    #coachId
+    #athleteId
 }
 
 entity "Participe" as takepart {
@@ -67,23 +117,28 @@ entity "Participe" as takepart {
     {static} #entrainementId   
 }
 
+entity "Donne" as givepart {
+    {static} #coachId
+    {static} #entrainementId   
+}
+
 
-entity "SourceDonnée" as source {
+entity "SourceDonnee" as source {
     {static} idSource
     type 
-    modèle
+    modele
-    précision
+    precision
     #athleteId
 }  
 
-entity "Activité" as activity {
+entity "Activite" as activity {
     {static} idActivité
     type
     date
-    heureDeDébut
+    heureDeDebut
     heureDeFin
     effortRessent
-    variabilité
+    variabilite
     variance
     ecartType
     moyenne
@@ -108,14 +163,114 @@ entity "FréquenceCardiaque" as fc {
 activity --> athlete
 activity --> source
 activity <-- fc
-coach --> athlete
 athlete <-- source
 stats --> athlete
 takepart --> athlete
 takepart --> training
+givepart --> athlete
+givepart --> training
+sendNotif --> athlete
+sendNotif --> notif
 friendship --> athlete
 notif --> athlete
-coach <-- training
 athlete <-- friendship
 @enduml
+```
+
+```plantuml
+@startuml
+skinparam classAttributeIconSize 0
+package MCD{
+entity "Athlete" as athlete {
+    {static} idAthlete
+    username
+    nom
+    prenom
+    email
+    sexe
+    taille
+    poids
+    motDePasse
+    dateNaissance
+    isCoach
+}
+
+entity "Notification" as notif {
+    {static} idNotif
+    message
+    date
+    statut
+    urgence
+    #athleteId
+}
+
+entity "Statistique" as stats {
+    {static} idStatistique
+    poids
+    fcMoyenne
+    fcMax
+    caloriesBruleesMoy
+    date 
+    #athleteId
+}
+
+entity "Entrainement" as training {
+    {static} idEntrainement
+    date
+    description
+    latitude
+    longitude
+    feedback
+    #athleteId
+}
+
+entity "SourceDonnee" as source {
+    {static} idSource
+    type 
+    modele
+    precision
+    #athleteId
+}  
+
+entity "Activite" as activity {
+    {static} idActivité
+    type
+    date
+    heureDeDebut
+    heureDeFin
+    effortRessent
+    variabilite
+    variance
+    ecartType
+    moyenne
+    maximum
+    minimum
+    temperatureMoyenne
+    #athleteId 
+    #sourceId
+}
+
+entity "FréquenceCardiaque" as fc {
+    {static} idFc
+    altitude
+    temps : time
+    température    
+    bpm
+    longitude
+    latitude
+    #activitéId
+}
+
+}
+activity "0..n" --- "1..1" athlete : réalise
+activity "1..n" --- "1..1" source : possede
+activity "1..1" --- "1..n" fc : enregistre
+athlete "1..n" --- "0..1" source : possede
+stats "0..n" --- "1..1" athlete : possede
+training "0..n" --- "1..n" athlete : participe
+training "0..n" --- "1..1" athlete : donne
+athlete "0..n" --- "1..n" athlete : est ami
+notif "0..n" --- "1..n" athlete : recoit
+notif "0..n" --- "1..1" athlete : envoie
+@enduml
 ```

Documents/Diagramme/DiagrammeDeClasses/README_DIAGRAMME.md

@@ -28,11 +28,11 @@ Bienvenue dans l'écosystème dynamique de notre plateforme de gestion d'activit
 
 - Les Utilisateurs ont un rôle spécifique (Athlete, Coach) qui détermine leurs fonctionnalités.
 
-- Un Athlète peut enregistrer plusieurs Activités, Statistiques, et interagir avec différentes Sources de Données.
+- Un Athlète peut enregistrer plusieurs Activités, possède des Statistiques, et une Sources de Données qui est la plus utilisé.
 
 - Les Entraînements sont liés aux Utilisateurs, permettant une planification efficace.
 
-- Les Notifications informent les Utilisateurs des événements importants.
+- Les Notifications informent les Utilisateurs des événements importants tels qu'une demande d'amis ou une notification d'avertissement de ban.
 
 Explorez ce diagramme pour comprendre comment notre plateforme offre une expérience complète, de la gestion des utilisateurs à l'enregistrement des activités sportives et au suivi des performances.
 

Documents/Diagramme/DiagrammeDeClasses/README_accesDonnees.md

@@ -18,7 +18,7 @@ Bienvenue dans le cœur de notre système, où les données prennent vie à trav
 
 - **NotificationRepository :** Responsable de la gestion des notifications, assurant un accès structuré et une manipulation sécurisée de ces informations cruciales.
 
-- **RelationshipRequestRepository :** Facilite la gestion des demandes de relations entre utilisateurs, garantissant une interaction claire et ordonnée.
+- **RelationshipRequestRepository :** Facilite la gestion des demandes de relations entre utilisateurs (amitiés), garantissant une interaction claire et ordonnée au sein de l'application.
 
 - **TrainingRepository :** Permet l'accès et la manipulation des données liées aux entraînements, facilitant le suivi des performances athlétiques.
 
@@ -26,7 +26,7 @@ Explorez ce diagramme pour découvrir la robustesse de notre architecture de ges
 
 ```plantuml
 @startuml couche_acces_aux_donnees
-abstract class IGenericRepository {
+interface IGenericRepository {
     + getItemById(int id) : object
     + getNbItems() : int
     + getItems(int index, int count, string orderingPropertyName, bool descending) : array

Documents/Diagramme/DiagrammeDeClasses/README_issue016.md

@@ -4,15 +4,15 @@
 
 # Introduction au Diagramme de Classes : Statistiques pour Coach
 
-Bienvenue dans l'univers captivant de notre système de gestion d'activités sportives avec une mise au point spéciale sur les statistiques destinées aux coaches. Ce diagramme de classes offre une vue approfondie de la manière dont les utilisateurs, en particulier les athlètes et les coaches, interagissent avec les données de performance.
+Bienvenue dans l'univers captivant de notre système de gestion d'activités sportives avec une mise au point spéciale sur les statistiques destinées aux athlètes. Ce diagramme de classes offre une vue approfondie de la manière dont les utilisateurs, en particulier les athlètes, interagissent avec leurs statistiques.
 
 **Entités Principales :**
 
 - **Utilisateur (User) :** Représente les individus inscrits sur notre plateforme, avec des détails personnels et un rôle spécifique dans l'écosystème sportif.
 
-- **Athlète (Athlete) :** Un type spécialisé d'utilisateur qui peut enregistrer des statistiques liées à ses activités sportives.
+- **Athlète (Athlete) :** Un type spécialisé d'utilisateur qui possède des statistiques liées à ses activités sportives.
 
-- **Coach (Coach) :** Un rôle qui s'étend à partir de la classe abstraite Role, dédié à la gestion des athlètes et de leurs statistiques.
+- **Coach (Coach) :** Un rôle qui s'étend à partir de la classe abstraite Role, dédié à la gestion des athlètes et de la vision de leurs statistiques.
 
 - **Statistique (Statistique) :** Contient des informations détaillées sur les performances sportives d'un athlète, telles que la distance totale, le poids, le temps total, la fréquence cardiaque moyenne, minimale et maximale, ainsi que les calories brûlées.
 
@@ -22,11 +22,11 @@ Bienvenue dans l'univers captivant de notre système de gestion d'activités spo
 
 - Un Coach peut gérer une liste d'athlètes et avoir accès à leurs statistiques.
 
-- Un Athlète peut enregistrer plusieurs statistiques liées à ses activités.
+- Un Athlète peut enregistrer plusieurs activités afin d'avoir des statistiques liées à celle-ci.
 
 **Objectif Principal :**
 
-- Permettre aux coaches d'accéder et de surveiller les statistiques détaillées de leurs athlètes, offrant ainsi un aperçu complet de leurs performances sportives. 
+- Permettre aux coachs d'accéder et de surveiller les statistiques détaillées de leurs athlètes, offrant ainsi un aperçu complet de leurs performances sportives. 
 
 Explorez ce diagramme pour découvrir comment notre application crée une synergie entre les utilisateurs, les rôles, et les statistiques, contribuant ainsi à une expérience enrichissante dans le suivi des activités sportives.
 

Documents/Diagramme/DiagrammeDeClasses/README_issue023.md

@@ -4,7 +4,7 @@
 
 # Introduction au Modèle de Données de l'Application
 
-L'architecture de données de notre application de suivi d'activités sportives repose sur un modèle robuste, avec des entités clés pour représenter les activités, les athlètes et les coachs. Découvrez les composants principaux de notre modèle de données :
+L'architecture de données de notre application de suivi d'activités sportives repose sur un modèle robuste, avec des entités clés pour représenter les activités, les athlètes et les coachs et la récupération de ces données au sein de notre application. Découvrez les composants principaux de notre modèle de données :
 
 ## Activité
 L'entité Activité représente une session d'activité sportive avec des détails variés tels que le type d'activité, la date, la durée, l'effort ressenti, etc. Le `ActiviteEntity` encapsule ces données, tandis que le `ActiviteGateway` gère la communication avec la base de données pour les activités.

Documents/Diagramme/DiagrammeDeClasses/README_issue028.md

@@ -4,12 +4,12 @@
 
 # Diagramme de classes pour l'importation de fichiers .fit
 
-Bienvenue dans le monde de la gestion d'activités sportives avec notre application innovante ! Cette user story se concentre sur une fonctionnalité essentielle qui améliorera l'expérience des utilisateurs : l'importation de fichiers .fit. Nous avons conçu un diagramme de classes pour vous offrir une vision claire et structurée de la manière dont cette fonctionnalité est implémentée au sein de notre application.
+Bienvenue dans le monde de la gestion d'activités sportives avec notre application innovante ! Ce diagramme de classe se concentre sur une fonctionnalité essentielle qui améliorera l'expérience des utilisateurs : l'importation de fichiers .fit. Nous avons conçu un diagramme de classes pour vous offrir une vision claire et structurée de la manière dont cette fonctionnalité est implémentée au sein de notre application.
 
 **Acteurs Principaux :**
 
-- Utilisateur (User) : Représente un individu inscrit sur notre plateforme, avec la capacité d'importer des fichiers .fit.
+- Utilisateur (User) : Représente un individu inscrit sur notre plateforme.
-- Athlète (Athlete) : Un type spécialisé d'utilisateur, bénéficiant de fonctionnalités supplémentaires liées à la gestion d'activités sportives.  
+- Athlète (Athlete) : Un type spécialisé d'utilisateur, bénéficiant de fonctionnalités supplémentaires liées à la gestion d'activités sportives et avec la capacité d'importer des fichiers .fit.  
 
 **Entités Clés :**
 
@@ -18,13 +18,13 @@ Bienvenue dans le monde de la gestion d'activités sportives avec notre applicat
 
 **Fonctionnalité Clé :**
 
-- Importation de fichiers .fit : Permet aux utilisateurs de charger des données provenant de fichiers .fit, générés par des dispositifs de suivi d'activité. Ces fichiers contiennent des informations précieuses telles que la fréquence cardiaque, la distance parcourue et d'autres métriques essentielles.
+- Importation de fichiers .fit : Permet aux utilisateurs de charger des données provenant de fichiers .fit via la bibliothèque `php-fit-file-analysis`, générés par des dispositifs de suivi d'activité. Ces fichiers contiennent des informations précieuses telles que la fréquence cardiaque, la distance parcourue et d'autres données de santé importante pour nos analyses.
 
 **Architecture :**
 
 - AuthService (Service d'Authentification) : Gère l'authentification des utilisateurs, garantissant un accès sécurisé à la fonction d'importation.
 - UserManager (Gestionnaire d'Utilisateurs) : Gère les opérations liées aux utilisateurs, y compris l'importation de fichiers .fit.
-ActivityManager (Gestionnaire d'Activités) : Responsable du stockage et de la gestion des activités importées.
+- ActivityManager (Gestionnaire d'Activités) : Responsable du stockage et de la gestion des activités importées.
 
 **Objectif :**
 

Documents/Diagramme/README_DIAGRAMMES.md

@@ -20,4 +20,7 @@
 ## Diagrammes de cas d'utilisation
 - [Cas d'utilisation pour la gestion du compte et des amitiés](CasUtilisations/README_gestionCompteAmitie.md)
 - [Cas d'utilisation pour la gestion des activités et données](CasUtilisations/README_gestionActivites.md)
-- [Cas d'utilisation pour la suivi d'une équipe sportive](CasUtilisations/README_coachSuiviSportif.md)
+- [Cas d'utilisation pour la suivi d'une équipe sportive](CasUtilisations/README_coachSuiviSportif.md)
+
+## Base de Données
+- [MLD](BDD/README_BDD.md)

README.md

@@ -71,7 +71,8 @@ Documentation et informations à propos de `HearthTrack` disponible [ici]()
 ### Prerequisites
 * [Visual Studio code](https://code.visualstudio.com/) - exemple d'IDE gratuit
 * [Git](https://git-scm.com/) - Versioning
-* [XAMPP : X, Apache, MySQL, Perl, PHP](https://www.apachefriends.org/fr/index.html) - Langages
+* [XAMPP : X, Apache, MySQL, Perl, PHP](https://www.apachefriends.org/fr/index.html) - Languages
+* [PostgreSQL](https://www.postgresql.org/) - Base de Donnée
   
 ## Getting Started
 1. Cloner le répos
@@ -80,7 +81,7 @@ Documentation et informations à propos de `HearthTrack` disponible [ici]()
 4. Lancer le serveur Apache et MySQL
 5. Lancer le projet avec `php -S localhost:8000 -t Sources/`
 6. Ouvrir le navigateur et aller sur `localhost:8000/index.php`
-
+ 
 ## Features
 * [x] Import de fichier .fit
 * [x] Ajout d'amis

Sources/composer.json

@@ -24,8 +24,7 @@
             "Shared\\Exception\\": "src/shared/exception",
             "Shared\\Attributes\\": "src/shared/attributes",
             "App\\Views\\Directives\\" : "src/app/views/directives",
-            "Data\\Core\\": "src/data/core/",
+            "Data\\Core\\": "src/data/core/" 
-            "Database\\": "src/data/core/database"
         }
     },
     "require": {
@@ -33,9 +32,7 @@
         "altorouter/altorouter": "1.1.0",
         "vlucas/phpdotenv": "^5.5",
         "psr/container": "^2.0",
-        "adriangibbons/php-fit-file-analysis": "^3.2.0",
+        "adriangibbons/php-fit-file-analysis": "^3.2.0"
-      "ext-couchbase": "*",
-        "ext-pdo": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "*"

Sources/config/.htaccess

@@ -0,0 +1,2 @@
+AddType text/css .css
+AddType application/javascript .js

Sources/config/Dockerfile

@@ -1,17 +1,31 @@
-FROM php:8.2-fpm
+FROM php:8.2-apache as base
 # Installation de dépendances nécessaires pour Composer
 RUN apt-get update && apt-get install -y \
     git \
     unzip
 
 # Installation de Composer
-# TODO : should use a image with composer install
+
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 RUN docker-php-ext-install pdo pdo_mysql
 
-COPY . /var/www/
+# Copy configs
+COPY ./config/virtual-host.conf /etc/apache2/sites-available/000-default.conf
+COPY ./config/httpd.conf /etc/apache2/httpd.conf
+
+# Setup App
+RUN mkdir -p /app/public && chown -R www-data:www-data /app
+
+WORKDIR /app
+
+# add sources code
+COPY . /app
+
+ENV VOLUME_PATH /app/public
+
+RUN composer install
 
-WORKDIR /var/www/
+EXPOSE 80
 
-RUN composer install
+CMD ["apache2-foreground"]

Sources/config/config.php

@@ -5,6 +5,7 @@ use Shared\Log;
 
 $dotenv = Dotenv::createUnsafeImmutable(__DIR__,'.env');
 $dotenv->safeLoad();
+// echo($_ENV);
 // apenrently getEnv is not a good thing cause
 // const DB_HOST = $_ENV['DB_HOST'] ?? 'localhost';
 // const DB_DATABASE = $_ENV['DB_DATABASE'] ?? 'heartTrack';

Sources/config/httpd.conf

@@ -0,0 +1 @@
+SetEnv ASSET_PREFIX containers/HeartDev-web/

Sources/config/nginx.conf

@@ -1,28 +1,19 @@
 server {
     listen 80;
-    index index.php;
+    index index.php index.html index.htm;
-    root /var/www/public;
+    root /usr/share/nginx/html;
     error_page 404 /index.php;
 
-    location ~ ^/(images|javascript|js|css|flash|media|static)/  {
-      root    /var/www/public;
-    }
 
     location ~ \.php$ {
-        fastcgi_pass web:9000; # service name defined in docker-compose.yml file like web
         fastcgi_param REQUEST_METHOD $request_method;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
-    }
+    }        
-    location ~ /\. {
-       deny all;
-       access_log off;
-       log_not_found off;
-    }
 
     location / {
-      try_files $uri $uri/ /index.php?$query_string;
+      root /usr/share/nginx/html;
+      try_files $uri /index.php;
     }
-
 }

Sources/config/virtual-host.conf

@@ -0,0 +1,39 @@
+<VirtualHost *:80>
+	ServerName default
+
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+		Require all denied
+	</Directory>
+
+	<Directory ${VOLUME_PATH}>
+		AllowOverride All
+		Require all granted
+	</Directory>
+
+	DocumentRoot ${VOLUME_PATH}
+
+	AccessFileName .htaccess
+	<FilesMatch "^\.ht">
+		Require all denied
+	</FilesMatch>
+
+	LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+	LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+	LogFormat "%h %l %u %t \"%r\" %>s %O" common
+	LogFormat "%{Referer}i -> %U" referer
+	LogFormat "%{User-agent}i" agent
+
+	CustomLog /proc/self/fd/1 combined
+
+	<FilesMatch \.php$>
+		SetHandler application/x-httpd-php
+	</FilesMatch>
+
+	# Multiple DirectoryIndex directives within the same context will add
+	# to the list of resources to look for rather than replace
+	# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+	DirectoryIndex disabled
+	DirectoryIndex index.php index.html
+</VirtualHost>

Sources/public/index.php

@@ -65,12 +65,4 @@ $appFactory->registerService(\Twig\Environment::class,\Twig\Environment::class);
 // $databaseContext = DatabaseContext::getInstance();
 
 $appFactory->AddControllers();
-$app = $appFactory->create();
-if (!is_null($app)){
-    // Ajout des Middleware
-    /*$app->use(new LoggingMiddleware());*/
-    $app->use(new AuthMiddleware());
-    $app->mapControllers();
-    $app->run(RequestFactory::createFromGlobals());
-}
 

Sources/public/js/script2.js

@@ -1,34 +0,0 @@
-/*!
-* Start Bootstrap - New Age v6.0.7 (https://startbootstrap.com/theme/new-age)
-* Copyright 2013-2023 Start Bootstrap
-* Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-new-age/blob/master/LICENSE)
-*/
-//
-// Scripts
-//
-
-window.addEventListener('DOMContentLoaded', event => {
-
-    // Activate Bootstrap scrollspy on the main nav element
-    const mainNav = document.body.querySelector('#mainNav');
-    if (mainNav) {
-        new bootstrap.ScrollSpy(document.body, {
-            target: '#mainNav',
-            offset: 74,
-        });
-    };
-
-    // Collapse responsive navbar when toggler is visible
-    const navbarToggler = document.body.querySelector('.navbar-toggler');
-    const responsiveNavItems = [].slice.call(
-        document.querySelectorAll('#navbarResponsive .nav-link')
-    );
-    responsiveNavItems.map(function (responsiveNavItem) {
-        responsiveNavItem.addEventListener('click', () => {
-            if (window.getComputedStyle(navbarToggler).display !== 'none') {
-                navbarToggler.click();
-            }
-        });
-    });
-
-});

Sources/public/js/scripts2.js

@@ -1,34 +0,0 @@
-/*!
-* Start Bootstrap - New Age v6.0.7 (https://startbootstrap.com/theme/new-age)
-* Copyright 2013-2023 Start Bootstrap
-* Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-new-age/blob/master/LICENSE)
-*/
-//
-// Scripts
-// 
-
-window.addEventListener('DOMContentLoaded', event => {
-
-    // Activate Bootstrap scrollspy on the main nav element
-    const mainNav = document.body.querySelector('#mainNav');
-    if (mainNav) {
-        new bootstrap.ScrollSpy(document.body, {
-            target: '#mainNav',
-            offset: 74,
-        });
-    };
-
-    // Collapse responsive navbar when toggler is visible
-    const navbarToggler = document.body.querySelector('.navbar-toggler');
-    const responsiveNavItems = [].slice.call(
-        document.querySelectorAll('#navbarResponsive .nav-link')
-    );
-    responsiveNavItems.map(function (responsiveNavItem) {
-        responsiveNavItem.addEventListener('click', () => {
-            if (window.getComputedStyle(navbarToggler).display !== 'none') {
-                navbarToggler.click();
-            }
-        });
-    });
-
-});

Sources/src/app/controller/AthleteController.php

@@ -2,13 +2,6 @@
 
 namespace App\Controller;
 
-use Database\ActivityEntity;
-use Database\ActivityGateway;
-use Database\ActivityMapper;
-use Database\AthleteMapper;
-use Database\EntrainementGateway;
-use Database\EntrainementMapper;
-use Shared\Validation;
 use App\Container;
 use App\Router\Request\IRequest;
 use App\Router\Response\Response;
@@ -16,154 +9,62 @@ use Shared\Attributes\Route;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
-use Manager\UserManager;
-use Database\Connexion;
-use Database\AthleteGateway;
 
 class AthleteController extends BaseController
 {
 
-    private Environment $twig;
+    #[Route(path: '/search-ath', name: 'search-ath', methods: ['GET'])]
-    protected Preferences $preference;
-
-    public function __construct()
-    {
-       //session_start();
-       $this->preference = new Preferences();
-    }
-
-//    #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
-//    public function searchUser(string $username, IRequest $req): Response
-//    {
-//        $taberror = [];
-//        if(!Validation::val_string($username)){
-//            print("Nom invalide.");
-//        }
-//        else {
-//            try {
-//                $athleteGateway = new AthleteGateway(new Connexion("mysql:host=localhost;dbname=sae_3", "Perederii", ""));
-////                $listSearch=$this->container->get(UserManager::class)->searchUsersByName($username);
-//                $listSearch = $athleteGateway->getAthlete();
-//                $map = new AthleteMapper ();
-//                $athleteEntity = $map->athleteSqlToEntity($listSearch);
-//                foreach ($athleteEntity as $entity) {
-//                    $users = $map->athleteEntityToModel($entity);
-//                    $listUsers[$i++]=['nom' => $users->getNom(), 'prenom'=>$users->getPrenom(), 'img'=>'john_doe'];
-//                }
-//
-//                $i=0;
-//                foreach ($users as $user){
-//                    echo "<h1> HELLO </h1>";
-//                    $listUsers[$i++]=['nom' => $user->getNom(), 'prenom'=>$user->getPrenom(), 'img'=>'john_doe', 'username'=>$user->getUsername()];
-//                }
-//                echo "<h1> HEllO </h1>";
-//                //$currentUser=$this->container->get(UserManager::class)->getCurrentUser();
-//                //$currentUser=$_SESSION['user'];
-//                $response = $this->render('./page/addfriend.html.twig',[
-//                    'css' => $_COOKIE['preferences'],
-//                    'pp' => "test",
-//                    'user' => 'johndoe',//$currentUser->getUsername(),
-//                    'role' => 'Athlete',//$currentUser->getRole(),
-//                    'users' => $listUsers
-//                ]);
-//            } catch (\Throwable $th) {
-//                throw $th;
-//                return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-//            }
-//        }
-//        return $response;
-//
-//    }
-
-    #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
     public function searchUser(string $username, IRequest $req): Response
     {
         $taberror = [];
-        if (!Validation::val_string($username)) {
+        $utiliArray = [
-            print("Nom invalide.");
+            [
-        } else {
+                'nom' => 'John',
-            try {
+                'prenom' => 'Doe',
-                $athleteGateway = new AthleteGateway(new Connexion("pgsql:host=localhost;dbname=sae_3", "Perederii", ""));
+                'img' => 'john_doe',
-                $listSearch = $athleteGateway->getAthlete($username);
+                'username' => 'johndoe',
-                $map = new AthleteMapper();
+            ],
-                $athleteEntity = $map->athleteSqlToEntity($listSearch);
+            [
-
+                'nom' => 'Alice',
-                $listUsers = [];
+                'prenom' => 'Smith',
-                $i = 0;
+                'img' => 'alice_smith',
-                foreach ($athleteEntity as $entity) {
+                'username' => 'alicesmith',
-                    $user = $map->athleteEntityToModel($entity);
+            ],
-                    $listUsers[$i] = ['idathlete' => number_format($user->getId(), 1), 'nom' => $user->getNom(),
+        ];
-                        'prenom' => $user->getPrenom(),'email' => $user->getEmail(), 'sexe' => $user->getSexe(),
+        // if(!Validation::val_string($name)){
-                        'taille' => $user->getTaille(), 'poids' => $user->getPoids(), 'motdepasse' => $user->getMotDePasse(),
-                        'datenaissance' => $user->getDateNaissance(), 'iscoach' => $user->getRole(), 'img' => 'test',
-                        'username' => $user->getUsername()];
-                    $i++;
-                }
-
-                $response = $this->render('./page/addfriend.html.twig',[
-                    'css' => $_COOKIE['preferences'],
-                    'pp' => 'test',
-                    'user' => 'johndoe',//$currentUser->getUsername(),
-                    'role' => 'Athlete',//$currentUser->getRole(),
-                    'users' => $listUsers
-                ]);
-
-            } catch (\Throwable $th) {
-                throw $th;
-                return $this->render("addfriend.html.twig", ['tabError' => $taberror]);
-            }
-        }
-        return $response;
-    }
-
-    #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
-    public function analyses(): Response
-    {
         try {
-            $activityGateway = new ActivityGateway(new Connexion("pgsql:host=localhost;dbname=sae_3", "Perederii", ""));
+            //code...
-            $listSearch = $activityGateway->getActivity();
+            //     $model->userMgr->getUser($name);
-            $map = new ActivityMapper();
+            return $this->render('./page/addfriend.html.twig', [
-            $activityGateway = $map->activitySqlToEntity($listSearch);
-            $listActivity = [];
-            $i = 0;
-            foreach ($activityGateway as $entity) {
-                $activity = $map->activityEntityToModel($entity);
-                $listActivity[$i] = ['idactivity' => number_format($activity->getIdActivity(), 1), 'type' => $activity->getType(),
-                    'date' => $activity->getDate(), 'heureDebut' => $activity->getHeureDebut(), 'heureFin' => $activity->getHeureFin(),
-                    'effortRessenti' => $activity->getEffortRessenti(), 'variabilite' => $activity->getVariabilite(), 'variance' => $activity->getVariance(),
-                    'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(),
-                    'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' =>$activity->getAvrTemperature()];
-                $i++;
-            }
-
-            $response = $this->render('./page/analyze.html.twig',[
                 'css' => $this->preference->getCookie(),
                 'pp' => "test2",
-                'user' => 'johndoe',//$currentUser->getUsername(),
+                'user' => "Doe",
-                'role' => 'Athlete',//$currentUser->getRole(),
+                'role' => "Athlète",
                 'friendship' => [],
                 'analyzes' => [],
                 'mails' => [],
-                'users' => [],
+                'users' => $utiliArray,
                 'infoUser' => [],
                 'exos' => [],
-                'member' => []
+                'member' => [],
+                'responce' => "Notification d'ajout envoyée à $username"
             ]);
         } catch (\Throwable $th) {
-            throw $th;
+            //throw $th;
-            return $this->render("./page/analyze.html.twig", ['tabError' => $taberror]);
+            // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
         }
-        return $response;
+        // }
+
     }
 
-    #[Route(path: '/activity', name: 'activity', methods: ['GET'])]
+    #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
-    public function activity(): Response
+    public function analyses(): Response
     {
-        return $this->render('./page/activity.html.twig',[
+        return $this->render('./page/analyze.html.twig', [
             'css' => $this->preference->getCookie(),
-            'pp' => "test",
+            'pp' => "test2",
-            'user' => 'johndoe',//$currentUser->getUsername(),
+            'user' => "Doe",
-            'role' => 'Athlete',//$currentUser->getRole(),
+            'role' => "Athlète",
             'friendship' => [],
             'analyzes' => [],
             'mails' => [],
@@ -178,67 +79,17 @@ class AthleteController extends BaseController
     #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
     public function exercice(): Response
     {
-        try {
+        return $this->render('./page/exercice.html.twig', [
-            $entrainementGateway = new EntrainementGateway(new Connexion("pgsql:host=localhost;dbname=sae_3", "Perederii", ""));
-            $listSearch = $entrainementGateway->getEntrainements();
-            $map = new EntrainementMapper();
-            $entrainementEntity = $map->entrainementSqlToEntity($listSearch);
-
-            $listUsers = [];
-            $i = 0;
-            foreach ($entrainementEntity as $entity) {
-                $user = $map->entrainementEntityToModel($entity);
-                $listUsers[$i] = ['idathlete' => number_format($user->getId(), 1), 'nom' => $user->getNom(),
-                    'prenom' => $user->getPrenom(),'email' => $user->getEmail(), 'sexe' => $user->getSexe(),
-                    'taille' => $user->getTaille(), 'poids' => $user->getPoids(), 'motdepasse' => $user->getMotDePasse(),
-                    'datenaissance' => $user->getDateNaissance(), 'iscoach' => $user->getRole(), 'img' => 'test',
-                    'username' => $user->getUsername()];
-                $i++;
-            }
-
-            $response = $this->render('./page/exercice.html.twig',[
-                'css' => $this->preference->getCookie(),
-                'pp' => "test2",
-                'user' => 'johndoe',//$currentUser->getUsername(),
-                'role' => 'Athlete',//$currentUser->getRole(),
-                'friendship' => [],
-                'analyzes' => [],
-                'mails' => [],
-                'users' => [],
-                'infoUser' => [],
-                'exos' => [],
-                'member' => []
-            ]);
-
-        } catch (\Throwable $th) {
-            throw $th;
-            return $this->render("addfriend.html.twig", ['tabError' => $taberror]);
-        }
-        return $response;
-    }
-
-    #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8
-    public function exercices(String $type, String $intensite, String $date, IRequest $req): Response
-    {
-        $exercicesArray = [
-            [
-                'date' => $date,
-                'type' => $type,
-                'intensite' => $intensite,
-                'status' => 'A venir',
-            ]
-        ];
-        return $this->render('./page/exercice.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
-            'user' => 'johndoe',//$currentUser->getUsername(),
+            'user' => "Doe",
-            'role' => 'Athlete',//$currentUser->getRole(),
+            'role' => "Athlète",
             'friendship' => [],
             'analyzes' => [],
             'mails' => [],
             'users' => [],
             'infoUser' => [],
-            'exos' => $exercicesArray,
+            'exos' => [],
             'member' => []
         ]);
     }
@@ -246,61 +97,54 @@ class AthleteController extends BaseController
     #[Route(path: '/add-friend', name: 'add-friend', methods: ['POST'])]
     public function addFriend(string $username, IRequest $req): Response
     {
+        $taberror = [];
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        // if(!Validation::val_string($name)){
         try {
-            $athleteGateway = new AthleteGateway(new Connexion("pgsql:host=localhost;dbname=sae_3", "Perederii", ""));
+            //code...
-            $userSearched=$athleteGateway->getAthleteByFirstName($username);
+            //     $model->userMgr->addFriend($name);
-            $currentUser=$this->container->get(UserManager::class)->getUserById(1);
+            return $this->render('./page/addfriend.html.twig', [
-            if ($userSearched!=null) {
-                $currentUser->addFriend($userSearched);
-                foreach ($userSearched as $user) {
-                    $users = ['nom' => $user->getNom(), 'prenom' => $user->getPrenom(), 'img' => 'test', 'username' => $user->getUsername()];
-                }
-            }
-            else{
-                $users=[];
-            }
-            return $this->render('./page/addfriend.html.twig',[
                 'css' => $this->preference->getCookie(),
                 'pp' => "test2",
-                'user' => 'johndoe',//$currentUser->getUsername(),
+                'user' => "Doe",
-                'role' => 'Athlete',//$currentUser->getRole(),
+                'role' => "Athlète",
                 'friendship' => [],
                 'analyzes' => [],
                 'mails' => [],
-                'users' => $users,
+                'users' => $utiliArray,
                 'infoUser' => [],
                 'exos' => [],
                 'member' => [],
                 'responce' => "Notification d'ajout envoyée à $username"
             ]);
         } catch (\Throwable $th) {
-            throw $th;
+            //throw $th;
-            return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+            // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-        }        
+        }
+        // }
+
     }
 
+
+
+    
     #[Route(path: '/friend', name: 'friend', methods: ['GET'])]
     public function friend(): Response
     {
-        return $this->render('./page/addfriend.html.twig',[
+        $utiliArray = [
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => 'John',//$currentUser->getUsername(),
-            'role' => 'Athlete',//$currentUser->getRole(),
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => [],
-        ]);
-    }
-
-    /*#[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])]
-    public function friendlist(string $username, IRequest $req): Response
-    {
-        $friendList = [
             [
                 'nom' => 'John',
                 'prenom' => 'Doe',
@@ -314,44 +158,19 @@ class AthleteController extends BaseController
                 'username' => 'alicesmith',
             ],
         ];
-        // TODO 
+        return $this->render('./page/addfriend.html.twig',[
-
-        // -> Enlever ou bloquer un utilisateur en fonction de son username
-        //$friendList = currentUser->getFriends();
-        return $this->render('./page/friend.html.twig',[
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => 'johndoe',//$currentUser->getUsername(),
-            'role' => 'Athlete',//$currentUser->getRole(),
-            'friendship' => $friendList,
-        ]);
-    }*/
-
-    #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])]
-    public function friendlist2(): Response
-    {
-        $athleteGateway = new AthleteGateway(new Connexion("pgsql:host=localhost;dbname=sae_3", "Perederii", ""));
-        $friendList = $athleteGateway->getListIdFriends(1);
-        foreach ($userSearched as $friendList) {
-            $users = ['nom' => $user->getNom(), 'prenom' => $user->getPrenom(), 'img' => 'test', 'username' => $user->getUsername()];
-        }
-        return $this->render('./page/friend.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
             'role' => "Athlète",
-            'friendship' => $list,
+            'friendship' => [],
             'analyzes' => [],
             'mails' => [],
-            'users' => [],
+            'users' => $utiliArray,
             'infoUser' => [],
             'exos' => [],
             'member' => [],
         ]);
     }
 
-    // #[Route(path: '/delete-friend', name: 'delete-friend', methods: ['POST'])]
+}
-    
-}
-
-?>

Sources/src/app/controller/AuthController.php

@@ -5,113 +5,46 @@ namespace App\Controller;
 use App\Container;
 use App\Router\Request\IRequest;
 use App\Router\Response\Response;
+use App\Router\Response\IResponse;
+
+use Couchbase\UserManager;
 use Shared\Attributes\Route;
+use Shared\Validation;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
 
 class AuthController extends BaseController
 {
-    
-    protected Preferences $preference;
 
-    public function __construct(){
-        $this->preference = new Preferences();
-    }
-
-    #[Route('/login', name: 'login')]
-    public function login(?string $username, ?string $password ,IRequest $request): Response {
-        // if user is already logged in, don't display the login page again
-        if ($user) {
-            return $this->redirectToRoute('blog_index');
-        }
 
-        // this statement solves an edge-case: if you change the locale in the login
+    #[Route('/login', name: 'login',methods: ['POST'])]
-        // page, after a successful login you are redirected to a page in the previous
+    public function login(IRequest $request): IResponse {
-        // locale. This code regenerates the referrer URL whenever the login page is
-        // browsed, to ensure that its locale is always the current one.
-        $this->saveTargetPath($request->getSession(), 'main', $this->generateUrl('admin_index'));
-
-        return $this->render('security/login.html.twig', [
-            // last username entered by the user (if any)
-            'last_username' => $helper->getLastUsername(),
-            // last authentication error (if any)
-            'error' => $helper->getLastAuthenticationError(),
-        ]);
-    }
-
-    // #[Route('/login', name: 'login')]
-    // public function login(?string $username, ?string $password ,IRequest $request): Response {
-    //     // if user is already logged in, don't display the login page again
-    //     if ($user) {
-    //         return $this->redirectToRoute('blog_index');
-    //     }
-
-    //     // this statement solves an edge-case: if you change the locale in the login
-    //     // page, after a successful login you are redirected to a page in the previous
-    //     // locale. This code regenerates the referrer URL whenever the login page is
-    //     // browsed, to ensure that its locale is always the current one.
-    //     $this->saveTargetPath($request->getSession(), 'main', $this->generateUrl('admin_index'));
-
-    //     return $this->render('security/login.html.twig', [
-    //         // last username entered by the user (if any)
-    //         'last_username' => $helper->getLastUsername(),
-    //         // last authentication error (if any)
-    //         'error' => $helper->getLastAuthenticationError(),
-    //     ]);
-    // }
-
-    #[Route(path: '/register', name: 'register', methods: ['POST'])]
-    public function register(string $username,string $mdp,string $confirmMdp,string $nom,string $prenom,string $dateNaissance,string $sexe,string $taille,string $poids, IRequest $req): Response
-    {
         
-       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+        $error = [];
-
+        try {
-        return $this->render('./page/home.html.twig',[
+            $log=Validation::clean_string($request->getBody()['email']);
-            'css' => $this->preference->getCookie()
+            $mdp=Validation::clean_string($request->getBody()['password']);
-        ]);
+        } catch (\Throwable $th) {
-    }
+            $error = "Wrong cred";
-
+        }
-    #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
-    public function register2(): Response
-    {
         
-       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+        if($this->container->get(UserManager::class)->login($log,$mdp)){
-
+            return $this->redirectToRoute('/');
-        return $this->render('./page/register.html.twig',[
-            'css' => $this->preference->getCookie()
-        ]);
-    }
-
-    
-    function inscription() {
-        $model = new ModelVisitor();
-        $log=Validation::clean_string($_POST['pseudo']);
-        $mdp=Validation::clean_string($_POST['password']);
-        if($model->createAUser($log,$mdp)){
-            if(ModelUser::login($log, $mdp)){
-                UserControler::displayView();
-            }
         }
-    }
+        else{
-    function connexion(){
+            $error [] = "Erreur de connexion. Essayez encore"; 
-        $model = new ModelVisitor();
+        }
-        if(!isset($_POST['pseudo']) || !isset($_POST['password'])) throw new Exception(" some wrong with credentials !!!!!");
+        return $this->render('./page/login.html.twig', ['error' => $error]);
-        $log=Validation::clean_string($_POST['pseudo']);
+        
-        $mdp=Validation::clean_string($_POST['password']);
+        
-            if(ModelUser::login($log, $mdp)){
-                UserControler::displayView();
-            }
         
     }
 
-    #[Route(path: '/pass', name: 'pass', methods: ['GET'])]
+    #[Route('/log', name: 'baseLog',methods: ['GET'])]
-    public function pass(): Response
+    public function index(IRequest $request): IResponse { 
-    {
-        
-       // CONFIRMER LES DONNESS !!!!! IMPORTANT
 
-        return $this->render('./page/password.html.twig',[
+        return $this->render('./page/login.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -124,36 +57,74 @@ class AuthController extends BaseController
             'exos' => [],
             'member' => []
         ]);
+
     }
 
-    #[Route(path: '/log', name: 'log', methods: ['GET'])]
+    #[Route('/register', name: 'register' , methods:['GET'])]
-    public function login2(): Response
+    public function register(IRequest $request): IResponse
     {
-        
+        if ($request->getMethod() == 'POST') {
-       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+            $nom = $request->getBody()['nom'];
+    
+            $prenom = $request->getBody()['prenom'];
+    
+            $username = $request->getBody()['username'];
+    
+            $email = $request->getBody()['email'];
+    
+            $motDePasse = $request->getBody()['motDePasse'];
+    
+            $sexe = $request->getBody()['sexe'];
+    
+            $taille = $request->getBody()['taille'];
+    
+            $poids = $request->getBody()['poids'];
+    
+            $dateNaissanceStr = $request->getBody()['nom'];
+            $dateNaissance = new \DateTime($dateNaissanceStr);
+    
+    
+            if (!$dateNaissance) {
+                throw new \Exception("Date de naissance non valide. Format attendu : YYYY-MM-DD");
+            }
+    
+            $roleName = $request->getBody()['roleName'];
+
+
+            $registrationData = [
+                'nom' => $nom,
+                'prenom' => $prenom,
+                'username' => $username,
+                'email' => $email,
+                'sexe' => $sexe,
+                'taille' => $taille,
+                'poids' => $poids,
+                'dateNaissance' => $dateNaissance,
+                'roleName' => $roleName
+            ];
+
+            try {
+                if ($this->container->get(UserManager::class)->register($email, $motDePasse, $registrationData)) {
+                    return $this->redirectToRoute('/');
+                } else {
+            
+                    $error [] = 'L\'inscription a échoué. Veuillez réessayer.';
+                }
+            } catch (\Exception $e) {
+                $error [] = 'Erreur lors de l\'inscription: ' . $e->getMessage(); 
+            }
+        }
 
-        return $this->render('./page/login.html.twig',[
+        return $this->render('/register.html.twig');
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => "Doe",
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
     }
 
-    #[Route(path: '/password', name: 'password', methods: ['POST'])]
+    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
-    public function password(string $email, IRequest $req): Response
+    public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
     {
         
        // CONFIRMER LES DONNESS !!!!! IMPORTANT
 
-        return $this->render('./page/login.html.twig',[
+        return $this->render('./page/settings.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -169,6 +140,8 @@ class AuthController extends BaseController
     }
 
     
-}
+   
 
+    
+}
 ?>

Sources/src/app/controller/CoachController.php

@@ -1,34 +1,49 @@
 <?php
 
-namespace App\Controller;
+// namespace App\Controller;
 
-use App\Container;
+// use App\Container;
-use App\Router\Request\IRequest;
+// use App\Router\Request\IRequest;
-use App\Router\Response\Response;
+// use App\Router\Response\Response;
-use App\Router\Response\IResponse;
+// use App\Router\Response\IResponse;
 
-use Shared\Attributes\Route;
+// use Shared\Attributes\Route;
-use Twig\Environment;
+// use Twig\Environment;
-use Data\Core\Preferences;
+// use Data\Core\Preferences;
-use Shared\Log;
+// use Shared\Log;
 
 
-class CoachController extends BaseController
-{
 
-    private ICoachManager $coachManager;
+// #[Route(path: '/coach', name: 'coach')]
-    private $security;
+// class CoachController extends BaseController
-    private Environment $twig;
+// {
-    protected Preferences $preference;
 
-    public function __construct(DataManager $dataManager, Security $security)
+//     private ICoachManager $coachManager;
-    {
+//     private $security;
-        session_start();
-        $this->coachManager = $dataManager->coachMgr;
-        $this->security = $security;
-        $this->preference = new Preferences();
-    }
 
+//     public function __construct(DataManager $dataManager, Security $security)
+//     {
+//         $this->coachManager = $dataManager->coachMgr;
+//         $this->security = $security;
+//     }
+
+//     #[Route(path: '/', name: 'home', methods: ['GET'])]
+//     public function index(): Response
+//     {
+//         return $this->render('./page/home.html.twig',[
+//             'css' => $this->preference->getCookie(),
+//             'pp' => "test2",
+//             'user' => "Doe",
+//             'role' => "Athlète",
+//             'friendship' => [],
+//             'analyzes' => [],
+//             'mails' => [],
+//             'users' => [],
+//             'infoUser' => [],
+//             'exos' => [],
+//             'member' => []
+//         ]);
+//     }
 //     #[Route('/global-stats', name: 'coach_global_stats', methods: ['GET'])]
 //     public function globalStats(): Response
 //     {
@@ -36,145 +51,41 @@ class CoachController extends BaseController
 //         return $this->render('coach/global_stats.html.twig');
 //     }
 
+// #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
+//     public function exercice(): Response
+//     {
+//         return $this->render('./page/exercice.html.twig',[
+//             'css' => $this->preference->getCookie(),
+//             'pp' => "test2",
+//             'user' => "Doe",
+//             'role' => "Athlète",
+//             'friendship' => [],
+//             'analyzes' => [],
+//             'mails' => [],
+//             'users' => [],
+//             'infoUser' => [],
+//             'exos' => [],
+//             'member' => []
+//         ]);
+//     }
 
-    #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
+// #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
-    public function coaching(): Response
+// public function coaching(): Response
-    {
+// {
-        return $this->render('./page/coaching.html.twig',[
+//     return $this->render('./page/coaching.html.twig',[
-            'css' => $this->preference->getCookie(),
+//         'css' => $this->preference->getCookie(),
-            'pp' => "test2",
+//         'pp' => "test2",
-            'user' => "Doe",
+//         'user' => "Doe",
-            'role' => "Coach",
+//         'role' => "Athlète",
-            'friendship' => [],
+//         'friendship' => [],
-            'analyzes' => [],
+//         'analyzes' => [],
-            'mails' => [],
+//         'mails' => [],
-            'users' => [],
+//         'users' => [],
-            'infoUser' => [],
+//         'infoUser' => [],
-            'exos' => [],
+//         'exos' => [],
-            'member' => []
+//         'member' => []
-        ]);
+//     ]);
-    }
+// }
-
-    #[Route(path: '/search-member', name: 'search-member', methods: ['GET'])]
-    public function searchMember(string $username, IRequest $req): Response
-    {
-        $taberror = [];
-        // FILTER 
-        $utiliArray = [
-            [
-                'nom' => 'John',
-                'prenom' => 'Doe',
-                'img' => 'john_doe',
-                'username' => 'johndoe',
-            ],
-            [
-                'nom' => 'Alice',
-                'prenom' => 'Smith',
-                'img' => 'alice_smith',
-                'username' => 'alicesmith',
-            ],
-        ];
-        // if(!Validation::val_string($name)){
-        try {
-                //code...
-                //     $model->userMgr->addFriend($name);
-                return $this->render('./page/addmember.html.twig',[
-                    'css' => $this->preference->getCookie(),
-                    'pp' => "test2",
-                    'user' => "Doe",
-                    'role' => "Athlète",
-                    'friendship' => [],
-                    'analyzes' => [],
-                    'mails' => [],
-                    'users' => $utiliArray,
-                    'infoUser' => [],
-                    'exos' => [],
-                    'member' => [],
-                    'responce' => "Notification d'ajout envoyée à $username"
-                ]);
-            } catch (\Throwable $th) {
-                //throw $th;
-                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-            }
-        // }
-        
-    }
-
-    #[Route(path: '/add-member', name: 'add-member', methods: ['POST'])]
-    public function addmember(string $username, IRequest $req): Response
-    {
-        $taberror = [];
-        $utiliArray = [
-            [
-                'nom' => 'John',
-                'prenom' => 'Doe',
-                'img' => 'john_doe',
-                'username' => 'johndoe',
-            ],
-            [
-                'nom' => 'Alice',
-                'prenom' => 'Smith',
-                'img' => 'alice_smith',
-                'username' => 'alicesmith',
-            ],
-        ];
-        // if(!Validation::val_string($name)){
-        try {
-                //code...
-                //     $model->userMgr->addFriend($name);
-                return $this->render('./page/addmember.html.twig',[
-                    'css' => $this->preference->getCookie(),
-                    'pp' => "test2",
-                    'user' => "Doe",
-                    'role' => "Athlète",
-                    'friendship' => [],
-                    'analyzes' => [],
-                    'mails' => [],
-                    'users' => $utiliArray,
-                    'infoUser' => [],
-                    'exos' => [],
-                    'member' => [],
-                    'responce' => "Notification d'ajout envoyée à $username"
-                ]);
-            } catch (\Throwable $th) {
-                //throw $th;
-                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-            }
-        // }
-        
-    }
-
-    #[Route(path: '/member', name: 'member', methods: ['GET'])]
-    public function member(): Response
-    {
-        $utiliArray = [
-            [
-                'nom' => 'John',
-                'prenom' => 'Doe',
-                'img' => 'john_doe',
-                'username' => 'johndoe',
-            ],
-            [
-                'nom' => 'Alice',
-                'prenom' => 'Smith',
-                'img' => 'alice_smith',
-                'username' => 'alicesmith',
-            ],
-        ];
-        return $this->render('./page/addmember.html.twig',[
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => "Doe",
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => $utiliArray,
-            'infoUser' => [],
-            'exos' => [],
-            'member' => [],
-        ]);
-    }
 
 //     #[Route('/list-athletes', name: 'coach_list_athletes')]
 //     public function listAthletes(): Response
@@ -210,4 +121,4 @@ class CoachController extends BaseController
 //     // }
 
     
-}
+// }

Sources/src/app/controller/Controller.php

@@ -1,716 +0,0 @@
-<?php
-
-// namespace App\Controller;
-
-// use App\Container;
-// use App\Router\Request\IRequest;
-// use App\Router\Response\Response;
-// use Shared\Attributes\Route;
-// use Twig\Environment;
-// use Data\Core\Preferences;
-// use Shared\Log;
-
-// // TODO : Remove this BaseClass
-// class Controller extends BaseController
-// {
-//     private Environment $twig;
-//     private Preferences $preference;
-
-//     public function __construct()
-//     {
-//        session_start();
-//        $this->preference = new Preferences();
-//     }
-    
-    // #[Route(path: '/', name: 'index', methods: ['GET'])]
-    // public function index(): Response
-    // {
-    //     return $this->render('./page/index.html',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/home', name: 'home', methods: ['GET'])]
-    // public function home(): Response
-    // {
-    //     return $this->render('./page/home.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
-    // public function analyses(): Response
-    // {
-    //     return $this->render('./page/analyze.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/activity', name: 'activity', methods: ['GET'])]
-    // public function activity(): Response
-    // {
-    //     return $this->render('./page/activity.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
-    // public function exercice(): Response
-    // {
-    //     return $this->render('./page/exercice.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8
-    // public function exercices(String $type, String $intensite, String $date, IRequest $req): Response
-    // {
-    //     $exercicesArray = [
-    //         [
-    //             'date' => $date,
-    //             'type' => $type,
-    //             'intensite' => $intensite,
-    //             'status' => 'A venur',
-    //         ]
-    //     ];
-    //     return $this->render('./page/exercice.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => $exercicesArray,
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
-    // public function searchUser(string $username, IRequest $req): Response
-    // {
-    //     $taberror = [];
-    //     // FILTER 
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'john_doe',
-    //             'username' => 'johndoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'alice_smith',
-    //             'username' => 'alicesmith',
-    //         ],
-    //     ];
-    //     // if(!Validation::val_string($name)){
-    //     try {
-    //             //code...
-    //             //     $model->userMgr->addFriend($name);
-    //             return $this->render('./page/addfriend.html.twig',[
-    //                 'css' => $this->preference->getCookie(),
-    //                 'pp' => "test2",
-    //                 'user' => "Doe",
-    //                 'role' => "Athlète",
-    //                 'friendship' => [],
-    //                 'analyzes' => [],
-    //                 'mails' => [],
-    //                 'users' => $utiliArray,
-    //                 'infoUser' => [],
-    //                 'exos' => [],
-    //                 'member' => [],
-    //                 'responce' => "Notification d'ajout envoyée à $username"
-    //             ]);
-    //         } catch (\Throwable $th) {
-    //             //throw $th;
-    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-    //         }
-    //     // }
-        
-    // }
-
-    // #[Route(path: '/search-member', name: 'search-member', methods: ['GET'])]
-    // public function searchMember(string $username, IRequest $req): Response
-    // {
-    //     $taberror = [];
-    //     // FILTER 
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'john_doe',
-    //             'username' => 'johndoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'alice_smith',
-    //             'username' => 'alicesmith',
-    //         ],
-    //     ];
-    //     // if(!Validation::val_string($name)){
-    //     try {
-    //             //code...
-    //             //     $model->userMgr->addFriend($name);
-    //             return $this->render('./page/addmember.html.twig',[
-    //                 'css' => $this->preference->getCookie(),
-    //                 'pp' => "test2",
-    //                 'user' => "Doe",
-    //                 'role' => "Athlète",
-    //                 'friendship' => [],
-    //                 'analyzes' => [],
-    //                 'mails' => [],
-    //                 'users' => $utiliArray,
-    //                 'infoUser' => [],
-    //                 'exos' => [],
-    //                 'member' => [],
-    //                 'responce' => "Notification d'ajout envoyée à $username"
-    //             ]);
-    //         } catch (\Throwable $th) {
-    //             //throw $th;
-    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-    //         }
-    //     // }
-        
-    // }
-
-    // #[Route(path: '/add-member', name: 'add-member', methods: ['POST'])]
-    // public function addmember(string $username, IRequest $req): Response
-    // {
-    //     $taberror = [];
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'john_doe',
-    //             'username' => 'johndoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'alice_smith',
-    //             'username' => 'alicesmith',
-    //         ],
-    //     ];
-    //     // if(!Validation::val_string($name)){
-    //     try {
-    //             //code...
-    //             //     $model->userMgr->addFriend($name);
-    //             return $this->render('./page/addmember.html.twig',[
-    //                 'css' => $this->preference->getCookie(),
-    //                 'pp' => "test2",
-    //                 'user' => "Doe",
-    //                 'role' => "Athlète",
-    //                 'friendship' => [],
-    //                 'analyzes' => [],
-    //                 'mails' => [],
-    //                 'users' => $utiliArray,
-    //                 'infoUser' => [],
-    //                 'exos' => [],
-    //                 'member' => [],
-    //                 'responce' => "Notification d'ajout envoyée à $username"
-    //             ]);
-    //         } catch (\Throwable $th) {
-    //             //throw $th;
-    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-    //         }
-    //     // }
-        
-    // }
-
-    // #[Route(path: '/member', name: 'member', methods: ['GET'])]
-    // public function member(): Response
-    // {
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'john_doe',
-    //             'username' => 'johndoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'alice_smith',
-    //             'username' => 'alicesmith',
-    //         ],
-    //     ];
-    //     return $this->render('./page/addmember.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => $utiliArray,
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => [],
-    //     ]);
-    // }
-
-    // #[Route(path: '/add-friend', name: 'add-friend', methods: ['POST'])]
-    // public function addFriend(string $username, IRequest $req): Response
-    // {
-    //     $taberror = [];
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'john_doe',
-    //             'username' => 'johndoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'alice_smith',
-    //             'username' => 'alicesmith',
-    //         ],
-    //     ];
-    //     // if(!Validation::val_string($name)){
-    //     try {
-    //             //code...
-    //             //     $model->userMgr->addFriend($name);
-    //             return $this->render('./page/addfriend.html.twig',[
-    //                 'css' => $this->preference->getCookie(),
-    //                 'pp' => "test2",
-    //                 'user' => "Doe",
-    //                 'role' => "Athlète",
-    //                 'friendship' => [],
-    //                 'analyzes' => [],
-    //                 'mails' => [],
-    //                 'users' => $utiliArray,
-    //                 'infoUser' => [],
-    //                 'exos' => [],
-    //                 'member' => [],
-    //                 'responce' => "Notification d'ajout envoyée à $username"
-    //             ]);
-    //         } catch (\Throwable $th) {
-    //             //throw $th;
-    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-    //         }
-    //     // }
-        
-    // }
-
-    // #[Route(path: '/friend', name: 'friend', methods: ['GET'])]
-    // public function friend(): Response
-    // {
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'john_doe',
-    //             'username' => 'johndoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'alice_smith',
-    //             'username' => 'alicesmith',
-    //         ],
-    //     ];
-    //     return $this->render('./page/addfriend.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => $utiliArray,
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => [],
-    //     ]);
-    // }
-
-    // #[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])]
-    // public function friendlist(string $username, IRequest $req): Response
-    // {
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'john_doe',
-    //             'username' => 'johndoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'alice_smith',
-    //             'username' => 'alicesmith',
-    //         ],
-    //     ];
-    //     /* TODO */
-
-    //     // -> Enlever ou bloquer un utilisateur en fonction de son username
-
-    //     return $this->render('./page/friend.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => $utiliArray,
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => [],
-    //     ]);
-    // }
-
-    // #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])]
-    // public function friendlist2(): Response
-    // {
-    //     $utiliArray = [
-    //         [
-    //             'nom' => 'John',
-    //             'prenom' => 'Doe',
-    //             'img' => 'test',
-    //             'status' => 'johndoe',
-    //             'username' => 'jdoe',
-    //         ],
-    //         [
-    //             'nom' => 'Alice',
-    //             'prenom' => 'Smith',
-    //             'img' => 'test2',
-    //             'status' => 'alicesmith',
-    //             'username' => 'asmith',
-    //         ],
-    //     ];
-    //     return $this->render('./page/friend.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => $utiliArray,
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => [],
-    //     ]);
-    // }
-
-    // #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
-    // public function coaching(): Response
-    // {
-    //     return $this->render('./page/coaching.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/mail', name: 'mail', methods: ['GET'])]
-    // public function mail(): Response
-    // {
-    //     return $this->render('./page/mail.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/import', name: 'import', methods: ['GET'])]
-    // public function import(): Response
-    // {
-    //     return $this->render('./page/import.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/settings', name: 'settings', methods: ['GET'])]
-    // public function settings(IRequest $req): Response
-    // {
-    //     return $this->render('./page/settings.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/profile', name: 'profile', methods: ['GET'])]
-    // public function profile(): Response
-    // {
-    //     return $this->render('./page/profile.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/preferences', name: 'preferences', methods: ['POST'])]
-    // public function preferences(string $theme, IRequest $req): Response
-    // {
-    //     /*TODO*/
-
-    //     //  VALIDER LES DONNEES
-    //     $this->preference->majCookie($theme);
-       
-    //     return $this->render('./page/settings.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/psettings', name: 'psettings', methods: ['POST'])]
-    // public function psettings(string $nom,string $prenom,string $dateNaissance,string $mail,string $tel, IRequest $req): Response
-    // {
-        
-       
-    //     return $this->render('./page/settings.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => $prenom,
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
-    // public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
-    // {
-        
-    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-    //     return $this->render('./page/settings.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/login', name: 'login', methods: ['POST'])]
-    // public function login(string $username,string $mdp, IRequest $req): Response
-    // {
-        
-    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-    //     return $this->render('./page/home.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/log', name: 'log', methods: ['GET'])]
-    // public function login2(): Response
-    // {
-        
-    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-    //     return $this->render('./page/login.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/register', name: 'register', methods: ['POST'])]
-    // public function register(string $username,string $mdp,string $confirmMdp,string $nom,string $prenom,string $dateNaissance,string $sexe,string $taille,string $poids, IRequest $req): Response
-    // {
-        
-    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-    //     return $this->render('./page/home.html.twig',[
-    //         'css' => $this->preference->getCookie()
-    //     ]);
-    // }
-
-    // #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
-    // public function register2(): Response
-    // {
-        
-    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-    //     return $this->render('./page/register.html.twig',[
-    //         'css' => $this->preference->getCookie()
-    //     ]);
-    // }
-
-    // #[Route(path: '/pass', name: 'pass', methods: ['GET'])]
-    // public function pass(): Response
-    // {
-        
-    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-    //     return $this->render('./page/password.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-
-    // #[Route(path: '/password', name: 'password', methods: ['POST'])]
-    // public function password(string $email, IRequest $req): Response
-    // {
-        
-    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-    //     return $this->render('./page/login.html.twig',[
-    //         'css' => $this->preference->getCookie(),
-    //         'pp' => "test2",
-    //         'user' => "Doe",
-    //         'role' => "Athlète",
-    //         'friendship' => [],
-    //         'analyzes' => [],
-    //         'mails' => [],
-    //         'users' => [],
-    //         'infoUser' => [],
-    //         'exos' => [],
-    //         'member' => []
-    //     ]);
-    // }
-    
-//}
-
-
-

Sources/src/app/controller/HeartRateController.php

@@ -1,45 +1,36 @@
 <?php
 
-namespace App\Controller;
+// namespace App\Controller;
-
+
-use App\Container;
+// use App\Container;
-use App\Router\Request\IRequest;
+// use App\Router\Request\IRequest;
-use App\Router\Response\Response;
+// use App\Router\Response\Response;
-use Shared\Attributes\Route;
+// use Shared\Attributes\Route;
-use Twig\Environment;
+// use Twig\Environment;
-use Data\Core\Preferences;
+// use Data\Core\Preferences;
-use Shared\Log;
+// use Shared\Log;
-
+
-class HeartRateController extends BaseController
+// class HeartRateController extends BaseController
-{
+// {
-
+
-    private Environment $twig;
+
-    protected Preferences $preference;
+//     #[Route(path: '/import', name: 'import', methods: ['GET'])]
-
+//     public function import(): Response
-    public function __construct()
+//     {
-    {
+//         return $this->render('./page/import.html.twig',[
-       session_start();
+//             'css' => $this->preference->getCookie(),
-       $this->preference = new Preferences();
+//             'pp' => "test2",
-    }
+//             'user' => "Doe",
-
+//             'role' => "Athlète",
-
+//             'friendship' => [],
-    #[Route(path: '/import', name: 'import', methods: ['GET'])]
+//             'analyzes' => [],
-    public function import(): Response
+//             'mails' => [],
-    {
+//             'users' => [],
-        return $this->render('./page/import.html.twig',[
+//             'infoUser' => [],
-            'css' => $this->preference->getCookie(),
+//             'exos' => [],
-            'pp' => "test2",
+//             'member' => []
-            'user' => "Doe",
+//         ]);
-            'role' => "Athlète",
+//     }
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
 
     
-}
+// }

Sources/src/app/controller/SocialController.php

@@ -1,45 +1,19 @@
 <?php
 
-namespace App\Controller;
+// namespace App\Controller;
 
-use App\Container;
+// use App\Container;
-use App\Router\Request\IRequest;
+// use App\Router\Request\IRequest;
-use App\Router\Response\Response;
+// use App\Router\Response\Response;
-use Shared\Attributes\Route;
+// use App\Router\Response\IResponse;
-use Twig\Environment;
-use Data\Core\Preferences;
-use Shared\Log;
 
-class SocialController extends BaseController
+// use Shared\Attributes\Route;
-{
+// use Twig\Environment;
+// use Data\Core\Preferences;
+// use Shared\Log;
 
-    private Environment $twig;
-    protected Preferences $preference;
 
-    public function __construct()
-    {
-       session_start();
-       $this->preference = new Preferences();
-    }
 
-
+// #[Route(path: '/coach', name: 'coach')]
-    #[Route(path: '/mail', name: 'mail', methods: ['GET'])]
+// class CoachController extends BaseController
-    public function mail(): Response
+// {
-    {
-        return $this->render('./page/mail.html.twig',[
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => "Doe",
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
-
-    
-}

Sources/src/app/controller/UserController.php

@@ -13,37 +13,11 @@ use Shared\Log;
 class UserController extends BaseController
 {
 
-    private Environment $twig;
-    protected Preferences $preference;
 
-    public function __construct()
+    #[Route(path: '/', name: 'home', methods: ['GET'])]
-    {
-       session_start();
-       $this->preference = new Preferences();
-    }
-
-
-    #[Route(path: '/', name: 'index', methods: ['GET'])]
     public function index(): Response
     {
-        return $this->render('./page/index.html',[
+        
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => "Doe",
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
-
-    #[Route(path: '/home', name: 'home', methods: ['GET'])]
-    public function home(): Response
-    {
         return $this->render('./page/home.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
@@ -78,28 +52,10 @@ class UserController extends BaseController
         ]);
     }
 
-    #[Route(path: '/profile', name: 'profile', methods: ['GET'])]
-    public function profile(): Response
-    {
-        return $this->render('./page/profile.html.twig',[
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => "Doe",
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
 
     #[Route(path: '/preferences', name: 'preferences', methods: ['POST'])]
     public function preferences(string $theme, IRequest $req): Response
     {
-        /*TODO*/
 
         //  VALIDER LES DONNEES
         $this->preference->majCookie($theme);
@@ -118,46 +74,5 @@ class UserController extends BaseController
             'member' => []
         ]);
     }
-
-    #[Route(path: '/psettings', name: 'psettings', methods: ['POST'])]
-    public function psettings(string $nom,string $prenom,string $dateNaissance,string $mail,string $tel, IRequest $req): Response
-    {
-        
-       
-        return $this->render('./page/settings.html.twig',[
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => $prenom,
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
-
-    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
-    public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
-    {
-        
-       // CONFIRMER LES DONNESS !!!!! IMPORTANT
-
-        return $this->render('./page/settings.html.twig',[
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => "Doe",
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
     
 }

Sources/src/app/views/Templates/authbase.html.twig

@@ -1,71 +1,71 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+    <head>
-    <meta charset="utf-8" />
+        <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <meta name="description" content="" />
+        <meta name="description" content="" />
-    <meta name="author" content="" />
+        <meta name="author" content="" />
-    <title>{% block title %}{% endblock %}</title>
+        <title>{% block title %}{% endblock %}</title>
-    <link href="/css/{% block css %}base_theme{% endblock %}.css" rel="stylesheet" />
+        <link href="/css/{% block css %}base_theme{% endblock %}.css" rel="stylesheet" />
-    <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
+        <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
-</head>
+    </head>
-<body class="bg-primary">
+    <body class="bg-primary">
-<div id="layoutAuthentication">
+        <div id="layoutAuthentication">
-    <div id="layoutAuthentication_content">
+            <div id="layoutAuthentication_content">
-        <main>
+                <main>
-            {% block main %}
+                {% block main %}
-                <div class="container">
+                    <div class="container">
-                    <div class="row justify-content-center">
+                        <div class="row justify-content-center">
-                        <div class="col-lg-5">
+                            <div class="col-lg-5">
-                            <div class="card shadow-lg border-0 rounded-lg mt-5">
+                                <div class="card shadow-lg border-0 rounded-lg mt-5">
-                                <div class="card-header"><h3 class="text-center font-weight-light my-4">Connexion</h3></div>
+                                    <div class="card-header"><h3 class="text-center font-weight-light my-4">Connexion</h3></div>
-                                <div class="card-body">
+                                    <div class="card-body">
-                                    <form>
+                                        <form>
-                                        <div class="form-floating mb-3">
+                                            <div class="form-floating mb-3">
-                                            <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />
+                                                <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />
-                                            <label for="inputEmail">Adresse eMail</label>
+                                                <label for="inputEmail">Adresse eMail</label>
-                                        </div>
+                                            </div>
-                                        <div class="form-floating mb-3">
+                                            <div class="form-floating mb-3">
-                                            <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />
+                                                <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />
-                                            <label for="inputPassword">Mot de passe</label>
+                                                <label for="inputPassword">Mot de passe</label>
-                                        </div>
+                                            </div>
-                                        <div class="form-check mb-3">
+                                            <div class="form-check mb-3">
-                                            <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
+                                                <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
-                                            <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
+                                                <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
-                                        </div>
+                                            </div>
-                                        <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
+                                            <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-                                            <a class="small" href="password.html">Mot de passe oublié ?</a>
+                                                <a class="small" href="password.html">Mot de passe oublié ?</a>
-                                            <a class="btn btn-primary" href="index.html">Se connecter</a>
+                                                <a class="btn btn-primary" href="index.html">Se connecter</a>
-                                        </div>
+                                            </div>
-                                    </form>
+                                        </form>
-                                </div>
+                                    </div>
-                                <div class="card-footer text-center py-3">
+                                    <div class="card-footer text-center py-3">
-                                    <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
+                                        <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
+                    {% endblock %}
-            {% endblock %}
+                </main>
-        </main>
+            </div>
-    </div>
+            <div id="layoutAuthentication_footer">
-    <div id="layoutAuthentication_footer">
+                <footer class="py-4 bg-light mt-auto">
-        <footer class="py-4 bg-light mt-auto">
+                    <div class="container-fluid px-4">
-            <div class="container-fluid px-4">
+                        <div class="d-flex align-items-center justify-content-between small">
-                <div class="d-flex align-items-center justify-content-between small">
+                            <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
-                    <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
+                            <div>
-                    <div>
+                                <a href="#">Politique de confidentialité</a>
-                        <a href="#">Politique de confidentialité</a>
+                                &middot;
-                        &middot;
+                                <a href="#">Termes &amp; Conditions d'utilisations</a>
-                        <a href="#">Termes &amp; Conditions d'utilisations</a>
+                            </div>
+                        </div>
                     </div>
-                </div>
+                </footer>
             </div>
-        </footer>
+        </div>
-    </div>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
-</div>
+        <script src="js/scripts.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+    </body>
-<script src="js/scripts.js"></script>
-</body>
 </html>

Sources/src/app/views/Templates/base.html.twig

@@ -8,7 +8,7 @@
         <meta name="author" content="PINAGOT Antoine" />
         <title>{% block title %}{% endblock %}</title>
         <link href="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/style.min.css" rel="stylesheet" />
-        <link href="/css/{% block css %}styles{% endblock %}.css" rel="stylesheet" />
+        <link href="/css/{% block css %}style{% endblock %}.css" rel="stylesheet" />
         <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
     </head>
 <body class="sb-nav-fixed">
@@ -35,7 +35,7 @@
                         <li><a class="dropdown-item" href="/profile">Profile</a></li>
                         <li><a class="dropdown-item" href="/settings">Paramètres</a></li>
                         <li><hr class="dropdown-divider" /></li>
-                        <li><a class="dropdown-item" href="/">Déconnexion</a></li>
+                        <li><a class="dropdown-item" href="/logout">Déconnexion</a></li>
                     </ul>
                 </li>
             </ul>
@@ -46,7 +46,7 @@
                     <div class="sb-sidenav-menu">
                         <div class="nav">
                             <div class="sb-sidenav-menu-heading">Menu</div>
-                            <a class="nav-link" href="/home">
+                            <a class="nav-link" href="/">
                                 <div class="sb-nav-link-icon"><img src="/assets/img/house.png"></div>
                                 Accueil
                             </a>

Sources/src/app/views/Templates/page/index.html

@@ -1,292 +1 @@
-<!DOCTYPE html>
+<a  href="/log">Se connecter</button>
-<html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-        <meta name="description" content="index page du site web" />
-        <meta name="author" content="PINAGOT Antoine" />
-        <title>HeartTrack - Getting Started</title>
-        <link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
-        <!-- Bootstrap icons-->
-        <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css" rel="stylesheet" />
-        <!-- Google fonts-->
-        <link rel="preconnect" href="https://fonts.gstatic.com" />
-        <link href="https://fonts.googleapis.com/css2?family=Newsreader:ital,wght@0,600;1,600&amp;display=swap" rel="stylesheet" />
-        <link href="https://fonts.googleapis.com/css2?family=Mulish:ital,wght@0,300;0,500;0,600;0,700;1,300;1,500;1,600;1,700&amp;display=swap" rel="stylesheet" />
-        <link href="https://fonts.googleapis.com/css2?family=Kanit:ital,wght@0,400;1,400&amp;display=swap" rel="stylesheet" />
-        <!-- Core theme CSS (includes Bootstrap)-->
-        <link href="css/styles2.css" rel="stylesheet" />
-    </head>
-    <body id="page-top">
-        <!-- Navigation-->
-        <nav class="navbar navbar-expand-lg navbar-light fixed-top shadow-sm" id="mainNav">
-            <div class="container px-5">
-                <a class="navbar-brand fw-bold" href="/">HeartTrack</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-                    Menu
-                    <i class="bi-list"></i>
-                </button>
-                <div class="collapse navbar-collapse" id="navbarResponsive">
-                    <ul class="navbar-nav ms-auto me-4 my-3 my-lg-0">
-                        <li class="nav-item"><a class="nav-link me-lg-3" href="/log">Se connecter</a></li>
-                        <li class="nav-item"><a class="nav-link me-lg-3" href="/regist">S'inscire</a></li>
-                    </ul>
-                    <button class="btn btn-primary rounded-pill px-3 mb-2 mb-lg-0" data-bs-toggle="modal" data-bs-target="#feedbackModal">
-                        <span class="d-flex align-items-center">
-                            <i class="bi-chat-text-fill me-2"></i>
-                            <span class="small">Donnez votre avis</span>
-                        </span>
-                    </button>
-                </div>
-            </div>
-        </nav>
-        <!-- Mashead header-->
-        <header class="masthead">
-            <div class="container px-5">
-                <div class="row gx-5 align-items-center">
-                    <div class="col-lg-6">
-                        <!-- Mashead text and app badges-->
-                        <div class="mb-5 mb-lg-0 text-center text-lg-start">
-                            <h1 class="display-1 lh-1 mb-3">HeartTrack pour mobile !</h1>
-                            <p class="lead fw-normal text-muted mb-5">Une application pour suivre vos analyses en direct, est en cours de développement.</p>
-                            <!-- <div class="d-flex flex-column flex-lg-row align-items-center">
-                                <a class="me-lg-3 mb-4 mb-lg-0" href="#!"><img class="app-badge" src="assets/img/google-play-badge.svg" alt="..." /></a>
-                                <a href="#!"><img class="app-badge" src="assets/img/app-store-badge.svg" alt="..." /></a>
-                            </div> -->
-                        </div>
-                    </div>
-                    <div class="col-lg-6">
-                        <!-- Masthead device mockup feature-->
-                        <div class="masthead-device-mockup">
-                            <svg class="circle" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-                                <defs>
-                                    <linearGradient id="circleGradient" gradientTransform="rotate(45)">
-                                        <stop class="gradient-start-color" offset="0%"></stop>
-                                        <stop class="gradient-end-color" offset="100%"></stop>
-                                    </linearGradient>
-                                </defs>
-                                <circle cx="50" cy="50" r="50"></circle></svg
-                            ><svg class="shape-1 d-none d-sm-block" viewBox="0 0 240.83 240.83" xmlns="http://www.w3.org/2000/svg">
-                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(120.42 -49.88) rotate(45)"></rect>
-                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(-49.88 120.42) rotate(-45)"></rect></svg
-                            ><svg class="shape-2 d-none d-sm-block" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"></circle></svg>
-                            <div class="device-wrapper">
-                                <div class="device" data-device="iPhoneX" data-orientation="portrait" data-color="black">
-                                    <div class="screen bg-black">
-                                        <!-- PUT CONTENTS HERE:-->
-                                        <!-- * * This can be a video, image, or just about anything else.-->
-                                        <!-- * * Set the max width of your media to 100% and the height to-->
-                                        <!-- * * 100% like the demo example below.-->
-                                        <video muted="muted" autoplay="" loop="" style="max-width: 100%; height: 100%"><source src="assets/img/demo-screen.mp4" type="video/mp4" /></video>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </header>
-        <!-- Quote/testimonial aside-->
-        <aside class="text-center bg-gradient-primary-to-secondary">
-            <div class="container px-5">
-                <div class="row gx-5 justify-content-center">
-                    <div class="col-xl-8">
-                        <div class="h2 fs-1 text-white mb-4">"Une solution gratuite pour analyser vos données de fréquences cardiaques !"</div>
-                        <img src="assets/img/tnw-logo.svg" alt="..." style="height: 3rem" />
-                    </div>
-                </div>
-            </div>
-        </aside>
-        <!-- App features section-->
-        <section id="features">
-            <div class="container px-5">
-                <div class="row gx-5 align-items-center">
-                    <div class="col-lg-8 order-lg-1 mb-5 mb-lg-0">
-                        <div class="container-fluid px-5">
-                            <div class="row gx-5">
-                                <div class="col-md-6 mb-5">
-                                    <!-- Feature item-->
-                                    <div class="text-center">
-                                        <i class="bi-phone icon-feature text-gradient d-block mb-3"></i>
-                                        <h3 class="font-alt">Web/Mobile</h3>
-                                        <p class="text-muted mb-0">Gardez les informations tant bien dans l'application que sur le site web avec la synchronisation des données !</p>
-                                    </div>
-                                </div>
-                                <div class="col-md-6 mb-5">
-                                    <!-- Feature item-->
-                                    <div class="text-center">
-                                        <i class="bi-cast icon-feature text-gradient d-block mb-3"></i>
-                                        <h3 class="font-alt">Importez vos données</h3>
-                                        <p class="text-muted mb-0">Importez vos données directement depuis un fichier .FIT !</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-md-6 mb-5 mb-md-0">
-                                    <!-- Feature item-->
-                                    <div class="text-center">
-                                        <i class="bi-gift icon-feature text-gradient d-block mb-3"></i>
-                                        <h3 class="font-alt">Gratuit</h3>
-                                        <p class="text-muted mb-0">Ce site et cette application sont entièrement gratuites !</p>
-                                    </div>
-                                </div>
-                                <div class="col-md-6">
-                                    <!-- Feature item-->
-                                    <div class="text-center">
-                                        <i class="bi-patch-check icon-feature text-gradient d-block mb-3"></i>
-                                        <h3 class="font-alt">Open Source</h3>
-                                        <p class="text-muted mb-0">Ce projet est fait en Open Source, tout le monde peut y accéder !</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-lg-4 order-lg-0">
-                        <!-- Features section device mockup-->
-                        <div class="features-device-mockup">
-                            <svg class="circle" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-                                <defs>
-                                    <linearGradient id="circleGradient" gradientTransform="rotate(45)">
-                                        <stop class="gradient-start-color" offset="0%"></stop>
-                                        <stop class="gradient-end-color" offset="100%"></stop>
-                                    </linearGradient>
-                                </defs>
-                                <circle cx="50" cy="50" r="50"></circle></svg
-                            ><svg class="shape-1 d-none d-sm-block" viewBox="0 0 240.83 240.83" xmlns="http://www.w3.org/2000/svg">
-                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(120.42 -49.88) rotate(45)"></rect>
-                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(-49.88 120.42) rotate(-45)"></rect></svg
-                            ><svg class="shape-2 d-none d-sm-block" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"></circle></svg>
-                            <div class="device-wrapper">
-                                <div class="device" data-device="iPhoneX" data-orientation="portrait" data-color="black">
-                                    <div class="screen bg-black">
-                                        <!-- PUT CONTENTS HERE:-->
-                                        <!-- * * This can be a video, image, or just about anything else.-->
-                                        <!-- * * Set the max width of your media to 100% and the height to-->
-                                        <!-- * * 100% like the demo example below.-->
-                                        <video muted="muted" autoplay="" loop="" style="max-width: 100%; height: 100%"><source src="assets/img/demo-screen.mp4" type="video/mp4" /></video>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-        <!-- Basic features section-->
-        <section class="bg-light">
-            <div class="container px-5">
-                <div class="row gx-5 align-items-center justify-content-center justify-content-lg-between">
-                    <div class="col-12 col-lg-5">
-                        <h2 class="display-4 lh-1 mb-4">Fonctionnalité supplémentaire de notre application</h2>
-                        <p class="lead fw-normal text-muted mb-5 mb-lg-0">Notre application propose un service de coaching personnalisé en fonction du besoin que vous avez en tant qu'athelète. Vous pouvez aussi fournir un service de coaching aux autres utilisateurs en vous inscrivant en tant que coach sportif.</p>
-                    </div>
-                    <div class="col-sm-8 col-md-6">
-                        <div class="px-5 px-sm-0"><img class="img-fluid rounded-circle" src="./assets/img/bg1.png" alt="..." /></div>
-                    </div>
-                </div>
-            </div>
-        </section>
-        <!-- Call to action section-->
-        <section class="cta">
-            <div class="cta-content">
-                <div class="container px-5">
-                    <h2 class="text-white display-1 lh-1 mb-4">
-                        Arrêtez d'attendre...
-                        <br />
-                        Inscrivez-vous !
-                    </h2>
-                    <!-- <a class="btn btn-outline-light py-3 px-4 rounded-pill" href="#" target="_blank">Download for free</a> -->
-                </div>
-            </div>
-        </section>
-        <!-- App badge section-->
-        <section class="bg-gradient-primary-to-secondary" id="download">
-            <div class="container px-5">
-                <h2 class="text-center text-white font-alt mb-4">Application bientôt disponible !</h2>
-                <!-- <div class="d-flex flex-column flex-lg-row align-items-center justify-content-center">
-                    <a class="me-lg-3 mb-4 mb-lg-0" href="#!"><img class="app-badge" src="assets/img/google-play-badge.svg" alt="..." /></a>
-                    <a href="#!"><img class="app-badge" src="assets/img/app-store-badge.svg" alt="..." /></a>
-                </div> -->
-            </div>
-        </section>
-        <!-- Footer-->
-        <footer class="bg-black text-center py-5">
-            <div class="container px-5">
-                <div class="text-white-50 small">
-                    <div class="mb-2">&copy; HeartTrack 2023. Tous droits réservé.</div>
-                    <a href="#!">Politique de confidentialité</a>
-                    <span class="mx-1">&middot;</span>
-                    <a href="#!">Termes & Conditions d'utilisation</a>
-                </div>
-            </div>
-        </footer>
-        <!-- Feedback Modal-->
-        <div class="modal fade" id="feedbackModal" tabindex="-1" aria-labelledby="feedbackModalLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered">
-                <div class="modal-content">
-                    <div class="modal-header bg-gradient-primary-to-secondary p-4">
-                        <h5 class="modal-title font-alt text-white" id="feedbackModalLabel">Envoyez votre avis</h5>
-                        <button class="btn-close btn-close-white" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body border-0 p-4">
-                        <!-- * * * * * * * * * * * * * * *-->
-                        <!-- * * SB Forms Contact Form * *-->
-                        <!-- * * * * * * * * * * * * * * *-->
-                        <!-- This form is pre-integrated with SB Forms.-->
-                        <!-- To make this form functional, sign up at-->
-                        <!-- https://startbootstrap.com/solution/contact-forms-->
-                        <!-- to get an API token!-->
-                        <form id="contactForm" data-sb-form-api-token="API_TOKEN">
-                            <!-- Name input-->
-                            <div class="form-floating mb-3">
-                                <input class="form-control" id="name" type="text" placeholder="Entrez votre nom complet..." data-sb-validations="required" />
-                                <label for="name">Nom complet</label>
-                                <div class="invalid-feedback" data-sb-feedback="name:required">Un nom est requis.</div>
-                            </div>
-                            <!-- Email address input-->
-                            <div class="form-floating mb-3">
-                                <input class="form-control" id="email" type="email" placeholder="nom@exemple.com" data-sb-validations="required,email" />
-                                <label for="email">Adresse email</label>
-                                <div class="invalid-feedback" data-sb-feedback="email:required">Adresse email requis.</div>
-                                <div class="invalid-feedback" data-sb-feedback="email:email">L'adresse email n'est pas valide.</div>
-                            </div>
-                            <!-- Phone number input-->
-                            <div class="form-floating mb-3">
-                                <input class="form-control" id="phone" type="tel" placeholder="06 12 34 56 78" data-sb-validations="required" />
-                                <label for="phone">Numéro de téléphone</label>
-                                <div class="invalid-feedback" data-sb-feedback="phone:required">Numéro de téléphone requis.</div>
-                            </div>
-                            <!-- Message input-->
-                            <div class="form-floating mb-3">
-                                <textarea class="form-control" id="message" type="text" placeholder="Entrez votre message..." style="height: 10rem" data-sb-validations="required"></textarea>
-                                <label for="message">Message</label>
-                                <div class="invalid-feedback" data-sb-feedback="message:required">Un message est requis.</div>
-                            </div>
-                            <!-- Submit success message-->
-                            <!---->
-                            <!-- This is what your users will see when the form-->
-                            <!-- has successfully submitted-->
-                            <div class="d-none" id="submitSuccessMessage">
-                                <div class="text-center mb-3">
-                                    <div class="fw-bolder">Avis envoyé !</div>
-                                </div>
-                            </div>
-                            <!-- Submit error message-->
-                            <!---->
-                            <!-- This is what your users will see when there is-->
-                            <!-- an error submitting the form-->
-                            <div class="d-none" id="submitErrorMessage"><div class="text-center text-danger mb-3">Erreur du formulaire !</div></div>
-                            <!-- Submit Button-->
-                            <div class="d-grid"><button class="btn btn-primary rounded-pill btn-lg disabled" id="submitButton" type="submit">Envoyer</button></div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- Bootstrap core JS-->
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
-        <!-- Core theme JS-->
-        <script src="js/scripts2.js"></script>
-        <script src="https://cdn.startbootstrap.com/sb-forms-latest.js"></script>
-    </body>
-</html>

Sources/src/app/views/Templates/page/login.html.twig

@@ -25,13 +25,13 @@
                                                 <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
                                             </div>
                                             <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-                                                <a class="small" href="/pass">Mot de passe oublié ?</a>
+                                                <a class="small" href="password.html">Mot de passe oublié ?</a>
-                                                <a class="btn btn-primary" href="/home">Se connecter</a>
+                                                <a class="btn btn-primary" href="index.html">Se connecter</a>
                                             </div>
                                         </form>
                                     </div>
                                     <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="/regist">Besoin d'un compte ? Inscrivez-vous !</a></div>
+                                        <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
                                     </div>
                                 </div>
                             </div>

Sources/src/app/views/Templates/page/password.html.twig

@@ -19,7 +19,7 @@
                                             </div>
                                             <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
                                                 <a class="small" href="/log">Retour à la connexion</a>
-                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</button>
+                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</a>
                                             </div>
                                         </form>
                                     </div>

Sources/src/app/views/Templates/page/register.html.twig

@@ -81,12 +81,12 @@
                                                 </div>
                                             </div>
                                             <div class="mt-4 mb-0">
-                                                <div class="d-grid"><a class="btn btn-primary btn-block" href="/log">Créer un compte</a></div>
+                                                <div class="d-grid"><a class="btn btn-primary btn-block" href="login.html.twig">Créer un compte</a></div>
                                             </div>
                                         </form>
                                     </div>
                                     <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="/log">Avez-vous déjà un compte ? Connectez-vous ?</a></div>
+                                        <div class="small"><a href="login.html.twig">Avez-vous déjà un compte ? Connectez-vous ?</a></div>
                                     </div>
                                 </div>
                             </div>

Sources/src/data/core/database/ActiviteEntity.php

@@ -2,8 +2,8 @@
 
 namespace Database;
 
-class ActivityEntity {
+class ActiviteEntity {
-    private $idActivity;
+    private $idActivite;
     private $type;
     private $date;
     private $heureDebut;
@@ -18,7 +18,7 @@ class ActivityEntity {
     private $temperatureMoyenne;
 
     // Getters
-    public function getIdActivity() {
+    public function getIdActivite() {
         return $this->idActivity;
     }
 
@@ -71,7 +71,7 @@ class ActivityEntity {
     }
 
     // Setters
-    public function setIdActivity($idActivity) {
+    public function setIdActivite($idActivite) {
         $this->idActivity = $idActivity;
     }
 
@@ -79,15 +79,15 @@ class ActivityEntity {
         $this->type = $type;
     }
 
-    public function setDate(\DateTime $date) {
+    public function setDate($date) {
         $this->date = $date;
     }
 
-    public function setHeureDebut(\DateTime $heureDebut) {
+    public function setHeureDebut($heureDebut) {
         $this->heureDebut = $heureDebut;
     }
 
-    public function setHeureFin(\DateTime $heureFin) {
+    public function setHeureFin($heureFin) {
         $this->heureFin = $heureFin;
     }
 

Sources/src/data/core/database/ActiviteGateway.php

@@ -1,39 +1,38 @@
 <?php
 
 namespace Database;
-use \PDO;
 
-class ActivityGateway {
+class ActiviteGateway {
-    private Connexion $connection;
+    private $connection;
 
-    public function __construct(Connexion $connection) {
+    public function __construct(Connection $connection) {
         $this->connection = $connection;
     }
 
-    public function getActivity() {
+    public function getActivite() {
         $query = "SELECT * FROM Activite";
         return $this->connection->executeWithErrorHandling($query);
     }
 
-    public function getActivityById(int $activityId) {
+    public function getActiviteById(int $activiteId) {
         $query = "SELECT * FROM Activite WHERE idActivite = :id";
-        $params = [':id' => [$activityId, PDO::PARAM_INT]];
+        $params = [':id' => [$activiteId, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActivityByType(string $type) {
+    public function getActiviteByType(string $type) {
         $query = "SELECT * FROM Activite WHERE type = :type";
         $params = [':type' => [$type, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActivityByDate(string $date) {
+    public function getActiviteByDate(string $date) {
         $query = "SELECT * FROM Activite WHERE date = :date";
         $params = [':date' => [$date, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActivityByTimeRange(string $startTime, string $endTime) {
+    public function getActiviteByTimeRange(string $startTime, string $endTime) {
         $query = "SELECT * FROM Activite WHERE heureDebut >= :startTime AND heureFin <= :endTime";
         $params = [
             ':startTime' => [$startTime, PDO::PARAM_STR],
@@ -42,76 +41,76 @@ class ActivityGateway {
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActivityByEffort(int $effortRessenti) {
+    public function getActiviteByEffort(int $effortRessenti) {
         $query = "SELECT * FROM Activite WHERE effortRessenti = :effort";
         $params = [':effort' => [$effortRessenti, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActivityByVariability(int $variabilite) {
+    public function getActiviteByVariability(int $variabilite) {
         $query = "SELECT * FROM Activite WHERE variabilite = :variability";
         $params = [':variability' => [$variabilite, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActivityByTemperature(int $temperatureMoyenne) {
+    public function getActiviteByTemperature(int $temperatureMoyenne) {
         $query = "SELECT * FROM Activite WHERE temperatureMoyenne = :temperature";
         $params = [':temperature' => [$temperatureMoyenne, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addActivity(ActivityEntity $activity) {
+    public function addActivite(ActiviteEntity $activite) {
         $query = "INSERT INTO Activite (type, date, heureDebut, heureDeFin, effortRessenti, variabilite, variance, ecartType, moyenne, maximum, minimum, temperatureMoyenne) 
                   VALUES (:type, :date, :heureDebut, :heureDeFin, :effortRessenti, :variabilite, :variance, :ecartType, :moyenne, :maximum, :minimum, :temperatureMoyenne)";
 
         $params = [
-            ':type' => $activity->getType(),
+            ':type' => $activite->getType(),
-            ':date' => $activity->getDate()->format('Y-m-d'), // Format date pour SQL
+            ':date' => $activite->getDate()->format('Y-m-d'), // Format date pour SQL
-            ':heureDebut' => $activity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
+            ':heureDebut' => $activite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
-            ':heureDeFin' => $activity->getHeureFin()->format('H:i:s'), // Format heure pour SQL
+            ':heureDeFin' => $activite->getHeureFin()->format('H:i:s'), // Format heure pour SQL
-            ':effortRessenti' => $activity->getEffortRessenti(),
+            ':effortRessenti' => $activite->getEffortRessenti(),
-            ':variabilite' => $activity->getVariabilite(),
+            ':variabilite' => $activite->getVariabilite(),
-            ':variance' => $activity->getVariance(),
+            ':variance' => $activite->getVariance(),
-            ':ecartType' => $activity->getEcartType(),
+            ':ecartType' => $activite->getEcartType(),
-            ':moyenne' => $activity->getMoyenne(),
+            ':moyenne' => $activite->getMoyenne(),
-            ':maximum' => $activity->getMaximum(),
+            ':maximum' => $activite->getMaximum(),
-            ':minimum' => $activity->getMinimum(),
+            ':minimum' => $activite->getMinimum(),
-            ':temperatureMoyenne' => $activity->getTemperatureMoyenne(),
+            ':temperatureMoyenne' => $activite->getTemperatureMoyenne(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateActivity(ActivityEntity $oldActivity, ActivityEntity $newActivity) {
+    public function updateActivite(ActiviteEntity $oldActivite, ActiviteEntity $newActivite) {
         $query = "UPDATE Activite
                   SET type = :type, date = :date, heureDebut = :heureDebut, heureDeFin = :heureDeFin,
                   effortRessenti = :effortRessenti, variabilite = :variabilite, variance = :variance, ecartType = :ecartType, moyenne = :moyenne, maximum = :maximum, minimum = :minimum, temperatureMoyenne = :temperatureMoyenne
                   WHERE idActivite = :idActivite";
 
         $params = [
-            ':idActivite' => $oldActivity->getIdActivity(),
+            ':idActivite' => $oldActivite->getIdActivite(),
-            ':type' => $newActivity->getType(),
+            ':type' => $newActivite->getType(),
-            ':date' => $newActivity->getDate()->format('Y-m-d'), // Format date pour SQL
+            ':date' => $newActivite->getDate()->format('Y-m-d'), // Format date pour SQL
-            ':heureDebut' => $newActivity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
+            ':heureDebut' => $newActivite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
-            ':heureDeFin' => $newActivity->getHeureFin()->format('H:i:s'), // Format heure pour SQL
+            ':heureDeFin' => $newActivite->getHeureFin()->format('H:i:s'), // Format heure pour SQL
-            ':effortRessenti' => $newActivity->getEffortRessenti(),
+            ':effortRessenti' => $newActivite->getEffortRessenti(),
-            ':variabilite' => $newActivity->getVariabilite(),
+            ':variabilite' => $newActivite->getVariabilite(),
-            ':variance' => $newActivity->getVariance(),
+            ':variance' => $newActivite->getVariance(),
-            ':ecartType' => $newActivity->getEcartType(),
+            ':ecartType' => $newActivite->getEcartType(),
-            ':moyenne' => $newActivity->getMoyenne(),
+            ':moyenne' => $newActivite->getMoyenne(),
-            ':maximum' => $newActivity->getMaximum(),
+            ':maximum' => $newActivite->getMaximum(),
-            ':minimum' => $newActivity->getMinimum(),
+            ':minimum' => $newActivite->getMinimum(),
-            ':temperatureMoyenne' => $newActivity->getTemperatureMoyenne(),
+            ':temperatureMoyenne' => $newActivite->getTemperatureMoyenne(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteActivity(int $idActivity) {
+    public function deleteActivite(int $idActivite) {
-        $query = "DELETE FROM Activite WHERE idActivite = :idActivity";
+        $query = "DELETE FROM Activite WHERE idActivite = :idActivite";
 
         $params = [
-            ':idActivity' => $idActivity,
+            ':idActivite' => $idActivite,
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);

Sources/src/data/core/database/ActiviteMapper.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Database;
+use Model\Activite;
+
+class ActiviteMapper {
+    public function map(array $data):ActiviteEntity {
+        $activite = new ActiviteEntity();
+        $activite->setIdActivite($data['idActivite']);
+        $activite->setType($data['type']);
+        $activite->setDate($data['date']);
+        $activite->setHeureDebut($data['heureDebut']);
+        $activite->setHeureFin($data['heureFin']);
+        $activite->setEffortRessenti($data['effortRessenti']);
+        $activite->setVariabilite($data['variabilite']);
+        $activite->setVariance($data['variance']);
+        $activite->setEcartType($data['ecartType']);
+        $activite->setMoyenne($data['moyenne']);
+        $activite->setMaximum($data['maximum']);
+        $activite->setMinimum($data['minimum']);
+        $activite->setTemperatureMoyenne($data['temperatureMoyenne']);
+
+        return $activite;
+    }
+
+    //public function ActiviteEntityToModel(ActiviteEntity entity): Activite;
+
+    public function ActiviteEntityToModel(ActiviteEntity $activiteEntity):Activite{
+
+        $act = new Activite(
+            $activiteEntity->getIdActivite(),
+            $activiteEntity->getType(),
+            $activiteEntity->getDate(),
+            $activiteEntity->getHeureDebut(),
+            $activiteEntity->getHeureFin(),
+            $activiteEntity->getEffortRessenti(),
+            $activiteEntity->getVariabilite(),
+            $activiteEntity->getVariance(),
+            $activiteEntity->getEcartType(),
+            $activiteEntity->getMoyenne(),
+            $activiteEntity->getMaximum(),
+            $activiteEntity->getMinimum(),
+            $activiteEntity->getTemperatureMoyenne()
+        );
+
+        return $act;
+    }
+    //public function ActiviteToEntity(Activite model): ActiviteEntity;
+}
+
+?>

Sources/src/data/core/database/ActivityMapper.php

@@ -1,118 +0,0 @@
-<?php
-
-namespace Database;
-use Model\Activity;
-
-class ActivityMapper {
-    public function activitySqlToEntity(array $data):array
-    {
-        $activityEntities = [];
-
-        foreach ($data as $activityData) {
-            $activity = new ActivityEntity();
-
-            if (isset($activityData['idActivity'])) {
-                $activity->setIdActivity($data['idActivity']);
-            }
-
-            if (isset($activityData['type'])) {
-                $activity->setType($data['type']);
-            }
-
-            if (isset($activityData['date'])) {
-                $activity->setDate($data['date']);
-            }
-
-            if (isset($activityData['heureDebut'])) {
-                $activity->setHeureDebut($data['heureDebut']);
-            }
-
-            if (isset($activityData['heureFin'])) {
-                $activity->setHeureFin($data['heureFin']);
-            }
-
-            if (isset($activityData['effortRessenti'])) {
-                $activity->setEffortRessenti($data['effortRessenti']);
-            }
-
-            if (isset($activityData['variabilite'])) {
-                $activity->setVariabilite($data['variabilite']);
-            }
-
-            if (isset($activityData['variance'])) {
-                $activity->setVariance($data['variance']);
-            }
-
-            if (isset($activityData['ecartType'])) {
-                $activity->setEcartType($data['ecartType']);
-            }
-
-            if (isset($activityData['moyenne'])) {
-                $activity->setMoyenne($data['moyenne']);
-            }
-
-            if (isset($activityData['maximum'])) {
-                $activity->setMaximum($data['maximum']);
-            }
-
-            if (isset($activityData['minimum'])) {
-                $activity->setMinimum($data['minimum']);
-            }
-
-            if (isset($activityData['temperatureMoyenne'])) {
-                $activity->setTemperatureMoyenne($data['temperatureMoyenne']);
-            }
-
-            $activityEntities[] = $activity;
-        }
-
-        return $activityEntities;
-    }
-
-    /**
-     * @throws \Exception
-     */
-    public function activityEntityToModel(ActivityEntity $activiteEntity):Activity{
-
-        $act = new Activity(
-            $activiteEntity->getIdActivity(),
-            $activiteEntity->getType(),
-            $activiteEntity->getDate(),
-            $activiteEntity->getHeureDebut(),
-            $activiteEntity->getHeureFin(),
-            $activiteEntity->getEffortRessenti(),
-            $activiteEntity->getVariabilite(),
-            $activiteEntity->getVariance(),
-            $activiteEntity->getEcartType(),
-            $activiteEntity->getMoyenne(),
-            $activiteEntity->getMaximum(),
-            $activiteEntity->getMinimum(),
-            $activiteEntity->getTemperatureMoyenne()
-        );
-
-        return $act;
-    }
-    //public function ActivityToEntity(Activity model): ActivityEntity;
-
-    public function activityToEntity(Activity $act):ActivityEntity{
-
-        $act = new ActivityEntity();
-        $act->setIdActivity($act->getIdActivity()());
-        $act->setType($act->getType());
-        $act->setDate($act->getDate());
-        $act->setHeureDebut($act->getHeureDebut());
-        $act->setHeureFin($act->getHeureFin());
-        $act->setEffortRessenti($act->getEffortRessenti());
-        $act->setVariabilite($act->getVariabilite());
-        $act->setVariance($act->getVariance());
-        $act->setEcartType($act->getEcartType());
-        $act->setMoyenne($act->getMoyenne());
-        $act->setMaximum($act->getMaximum());
-        $act->setMinimum($act->getMinimum());
-        $act->setTemperatureMoyenne($act->getTemperatureMoyenne());
-
-        return $act;
-    }
-}
-
-?>

Sources/src/data/core/database/AthleteEntity.php

@@ -12,7 +12,6 @@ class AthleteEntity {
     private $poids;
     private $motDePasse;
     private $dateNaissance;
-    private $isCoach;
 
     // Getters
     public function getIdAthlete() {
@@ -51,10 +50,6 @@ class AthleteEntity {
         return $this->dateNaissance;
     }
 
-    public function getIsCoach(){
-        return $this->isCoach;
-    }
-
     // Setters
     public function setIdAthlete($idAthlete) {
         $this->idAthlete = $idAthlete;
@@ -91,10 +86,6 @@ class AthleteEntity {
     public function setDateNaissance($dateNaissance) {
         $this->dateNaissance = $dateNaissance;
     }
-
-    public function setIsCoach($isCoach){
-        $this->isCoach = $isCoach;
-    }
 }
 
 ?>

Sources/src/data/core/database/AthleteGateway.php

@@ -2,94 +2,70 @@
 
 namespace Database;
 use \PDO;
-use Shared\Log;
 
 class AthleteGateway {
-    private Connexion $connection;
+    private $connection;
 
     public function __construct(Connexion $connection) {
         $this->connection = $connection;
     }
 
-    public function getAthlete(): array
+    public function getAthlete() {
-    {
+        $query = "SELECT * FROM Athlete";
-        $query = "SELECT * FROM Athlete WHERE isCoach=FALSE";
+        return $this->connection->executeWithErrorHandling($query);
-        $res = $this->connection->executeWithErrorHandling($query);
-        return $res;
     }
 
-    public function getAthleteById(int $userId): array
+    public function getAthleteById(int $userId) {
-    {
+        $query = "SELECT * FROM Athlete WHERE idAthlete = :id";
-        $query = "SELECT * FROM Athlete WHERE idAthlete = :id AND isCoach=FALSE";
         $params = [':id' => [$userId, PDO::PARAM_INT]];
-        $res = $this->connection->executeWithErrorHandling($query, $params);
+        return $this->connection->executeWithErrorHandling($query, $params);
-        return $res;
     }
 
-    public function getAthleteByName(string $name): array
+    public function getAthleteByName(string $name) {
-    {
+        $query = "SELECT * FROM Athlete WHERE nom = :name";
-        $query = "SELECT * FROM Athlete WHERE nom = :name AND isCoach=FALSE";
         $params = [':name' => [$name, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByFirstName(string $firstName): array
+    public function getAthleteByFirstName(string $firstName) {
-    {
+        $query = "SELECT * FROM Athlete WHERE prenom = :firstName";
-        $query = "SELECT * FROM Athlete WHERE prenom = :firstName AND isCoach=FALSE";
         $params = [':firstName' => [$firstName, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByEmail(string $email): array
+    public function getAthleteByEmail(string $email) {
-    {
+        $query = "SELECT * FROM Athlete WHERE email = :email";
-        $query = "SELECT * FROM Athlete WHERE email = :email AND isCoach=FALSE";
         $params = [':email' => [$email, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByGender(string $gender): array
+    public function getAthleteByGender(string $gender) {
-    {
+        $query = "SELECT * FROM Athlete WHERE sexe = :gender";
-        $query = "SELECT * FROM Athlete WHERE sexe = :gender AND isCoach=FALSE";
         $params = [':gender' => [$gender, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByHeight(int $height): array
+    public function getAthleteByHeight(int $height) {
-    {
+        $query = "SELECT * FROM Athlete WHERE taille = :height";
-        $query = "SELECT * FROM Athlete WHERE taille = :height AND isCoach=FALSE";
         $params = [':height' => [$height, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByWeight(int $weight): array
+    public function getAthleteByWeight(int $weight) {
-    {
+        $query = "SELECT * FROM Athlete WHERE poids = :weight";
-        $query = "SELECT * FROM Athlete WHERE poids = :weight AND isCoach=FALSE";
         $params = [':weight' => [$weight, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByBirthDate(string $birthdate): array
+    public function getAthleteByBirthDate(string $birthdate) {
-    {
+        $query = "SELECT * FROM Athlete WHERE dateNaissance = :birthdate";
-        $query = "SELECT * FROM Athlete WHERE dateNaissance = :birthdate AND isCoach=FALSE";
         $params = [':birthdate' => [$birthdate, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getListIdFriends(int $idAthlete): array
+    public function addAthlete(AthleteEntity $athlete) {
-    {
+        $query = "INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) 
-        $query = "SELECT idAthlete1, idAthlete2 FROM Friendship WHERE idAthlete1 = :idAthlete OR idAthlete2= :idAthlete";
+                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)";
-
-        $params = [
-            ':idAthlete' => $idAthlete,
-        ];
-
-        return $this->connection->executeWithErrorHandling($query, $params);
-    }
-
-    public function addAthlete(AthleteEntity $athlete): array
-    {
-        $query = "INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance, isCoach) 
-                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance, :isCoach)";
 
         $params = [
             ':nom' => $athlete->getNom(),
@@ -99,18 +75,16 @@ class AthleteGateway {
             ':taille' => $athlete->getTaille(),
             ':poids' => $athlete->getPoids(),
             ':motDePasse' => $athlete->getMotDePasse(),
-            ':dateNaissance' => $athlete->getDateNaissance(),
+            ':dateNaissance' => $athlete->getDateNaissance(), 
-            ':isCoach' => $athlete->getIsCoach(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateAthlete(AthleteEntity $oldAthlete, AthleteEntity $newAthlete): array
+    public function updateAthlete(AthleteEntity $oldAthlete, AthleteEntity $newAthlete) {
-    {
         $query = "UPDATE Athlete 
                   SET nom = :nom, prenom = :prenom, email = :email, sexe = :sexe,
-                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance, isCoach = :isCoach
+                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance
                   WHERE idAthlete = :idAthlete";
 
         $params = [
@@ -122,15 +96,13 @@ class AthleteGateway {
             ':taille' => $newAthlete->getTaille(),
             ':poids' => $newAthlete->getPoids(),
             ':motDePasse' => $newAthlete->getMotDePasse(),
-            ':dateNaissance' => $newAthlete->getDateNaissance(),
+            ':dateNaissance' => $newAthlete->getDateNaissance(), 
-            ':isCoach' => $newAthlete->getIsCoach(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteAthlete(int $idAthlete): array
+    public function deleteAthlete(int $idAthlete) {
-    {
         $query = "DELETE FROM Athlete WHERE idAthlete = :idAthlete";
 
         $params = [

Sources/src/data/core/database/AthleteMapper.php

@@ -6,16 +6,16 @@ use \PDO;
 use \DateTime;
 use Model\Role;
 use Model\Athlete;
-use Shared\Log;
 
 class AthleteMapper {
-    public function athleteSqlToEntity(array $data): array {
+    public function fromSqlToEntity(array $data): array {
         $athleteEntities = [];
 
         foreach ($data as $athleteData) {
             $athlete = new AthleteEntity();
-            if (isset($athleteData['idathlete'])) {
+
-                $athlete->setIdAthlete($athleteData['idathlete']);
+            if (isset($athleteData['idAthlete'])) {
+                $athlete->setIdAthlete($athleteData['idAthlete']);
             }
 
             if (isset($athleteData['nom'])) {
@@ -42,16 +42,12 @@ class AthleteMapper {
                 $athlete->setPoids($athleteData['poids']);
             }
 
-            if (isset($athleteData['motdepasse'])) {
+            if (isset($athleteData['motDePasse'])) {
-                $athlete->setMotDePasse($athleteData['motdepasse']);
+                $athlete->setMotDePasse($athleteData['motDePasse']);
-            }
-
-            if (isset($athleteData['datenaissance'])) {
-                $athlete->setDateNaissance($athleteData['datenaissance']);
             }
 
-            if (isset($athleteData['iscoach'])) {
+            if (isset($athleteData['dateNaissance'])) {
-                $athlete->setIsCoach($athleteData['iscoach']);
+                $athlete->setDateNaissance($athleteData['dateNaissance']);
             }
 
             $athleteEntities[] = $athlete;
@@ -62,12 +58,14 @@ class AthleteMapper {
     
     public function athleteEntityToModel(AthleteEntity $athleteEntity): User {
         $role = new Athlete(); // Utilisez la classe Athlete
-        $date = new DateTime($athleteEntity->getDateNaissance());
+
+        $dateSpecifique = $athleteEntity->getDateNaissance();
+        $date = new DateTime($dateSpecifique);
+
         $user = new User(
             $athleteEntity->getIdAthlete(),
             $athleteEntity->getNom(),
             $athleteEntity->getPrenom(),
-            "myUsername",
             $athleteEntity->getEmail(),
             $athleteEntity->getMotDePasse(),
             $athleteEntity->getSexe(),
@@ -92,8 +90,6 @@ class AthleteMapper {
         $ath->setPoids($user->getPoids());
         $ath->setMotDePasse($user->getMotDePasse());
         $ath->setDateNaissance($user->getDateNaissance());
-        $ath->setIsCoach(FALSE);
-        $ath->setCoachId(NULL);
 
         return $ath;
     }

Sources/src/data/core/database/CoachEntity.php

@@ -4,15 +4,50 @@ namespace Database;
 
 class CoachEntity {
     private $idCoach;
-    private $athleteId;
+    private $nom;
+    private $prenom;
+    private $email;
+    private $sexe;
+    private $taille;
+    private $poids;
+    private $motDePasse;
+    private $dateNaissance;
 
     // Getters
     public function getIdCoach() {
         return $this->idCoach;
     }
 
-    public function getAthleteId() {
+    public function getNom() {
-        return $this->athleteId;
+        return $this->nom;
+    }
+
+    public function getPrenom() {
+        return $this->prenom;
+    }
+
+    public function getEmail() {
+        return $this->email;
+    }
+
+    public function getSexe() {
+        return $this->sexe;
+    }
+
+    public function getTaille() {
+        return $this->taille;
+    }
+
+    public function getPoids() {
+        return $this->poids;
+    }
+
+    public function getMotDePasse() {
+        return $this->motDePasse;
+    }
+
+    public function getDateNaissance() {
+        return $this->dateNaissance;
     }
 
     // Setters
@@ -20,10 +55,37 @@ class CoachEntity {
         $this->idCoach = $idCoach;
     }
 
-    public function setAthleteId($athleteId) {
+    public function setNom($nom) {
-        $this->athleteId = $athleteId;
+        $this->nom = $nom;
     }
 
+    public function setPrenom($prenom) {
+        $this->prenom = $prenom;
+    }
+
+    public function setEmail($email) {
+        $this->email = $email;
+    }
+
+    public function setSexe($sexe) {
+        $this->sexe = $sexe;
+    }
+
+    public function setTaille($taille) {
+        $this->taille = $taille;
+    }
+
+    public function setPoids($poids) {
+        $this->poids = $poids;
+    }
+
+    public function setMotDePasse($motDePasse) {
+        $this->motDePasse = $motDePasse;
+    }
+
+    public function setDateNaissance($dateNaissance) {
+        $this->dateNaissance = $dateNaissance;
+    }
 }
 
 ?>

Sources/src/data/core/database/CoachGateway.php

@@ -10,96 +10,93 @@ class CoachGateway {
         $this->connection = $connection;
     }
 
-    public function getCoach(): array
+    public function getCoach() {
-    {
         $query = "SELECT * FROM Coach";
         return $this->connection->executeWithErrorHandling($query);
     }
 
-    public function getCoachById(int $userId): array
+    public function getCoachById(int $userId) {
-    {
         $query = "SELECT * FROM Coach WHERE idCoach = :id";
         $params = [':id' => [$userId, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByCoachId(int $coachId): array
+    public function getCoachByName(string $name) {
-    {
+        $query = "SELECT * FROM Coach WHERE nom = :name";
-        $query = "SELECT * FROM Athlete a, Coach c WHERE a.coachId = :id AND a.isCoach = TRUE";
-        $params = [':id' => [$coachId, PDO::PARAM_INT]];
-        return $this->connection->executeWithErrorHandling($query, $params);
-    }
-
-    public function getCoachByName(string $name): array
-    {
-        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.nom = :name";
         $params = [':name' => [$name, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByFirstName(string $firstName): array
+    public function getCoachByFirstName(string $firstName) {
-    {
+        $query = "SELECT * FROM Coach WHERE prenom = :firstName";
-        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.prenom = :firstName";
         $params = [':firstName' => [$firstName, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByEmail(string $email): array
+    public function getCoachByEmail(string $email) {
-    {
+        $query = "SELECT * FROM Coach WHERE email = :email";
-        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.email = :email";
         $params = [':email' => [$email, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByGender(string $gender): array
+    public function getCoachByGender(string $gender) {
-    {
+        $query = "SELECT * FROM Coach WHERE sexe = :gender";
-        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.sexe = :gender";
         $params = [':gender' => [$gender, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByHeight(int $height): array
+    public function getCoachByHeight(int $height) {
-    {
+        $query = "SELECT * FROM Coach WHERE taille = :height";
-        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.taille = :height";
         $params = [':height' => [$height, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByBirthDate(string $birthdate): array
+    public function getCoachByBirthDate(string $birthdate) {
-    {
+        $query = "SELECT * FROM Coach WHERE dateNaissance = :birthdate";
-        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.dateNaissance = :birthdate";
         $params = [':birthdate' => [$birthdate, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addCoach(CoachEntity $coach): array
+    public function addCoach(CoachEntity $coach) {
-    {
+        $query = "INSERT INTO Coach (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) 
-        $query = "INSERT INTO Coach (athleteId) 
+                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)";
-                  VALUES (:athleteId)";
 
         $params = [
-            ':athleteId' => $coach->getAthleteId(),
+            ':nom' => $coach->getNom(),
+            ':prenom' => $coach->getPrenom(),
+            ':email' => $coach->getEmail(),
+            ':sexe' => $coach->getSexe(),
+            ':taille' => $coach->getTaille(),
+            ':poids' => $coach->getPoids(),
+            ':motDePasse' => $coach->getMotDePasse(),
+            ':dateNaissance' => $coach->getDateNaissance(), 
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateCoach(CoachEntity $oldCoach, CoachEntity $newCoach): array
+    public function updateCoach(CoachEntity $oldCoach, CoachEntity $newCoach) {
-    {
         $query = "UPDATE Coach 
-                  SET athleteId = :athleteId
+                  SET nom = :nom, prenom = :prenom, email = :email, sexe = :sexe,
+                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance
                   WHERE idCoach = :idCoach";
 
         $params = [
             ':idCoach' => $oldCoach->getIdCoach(),
-            ':athleteId' => $newCoach->getAthleteId(),
+            ':nom' => $newCoach->getNom(),
+            ':prenom' => $newCoach->getPrenom(),
+            ':email' => $newCoach->getEmail(),
+            ':sexe' => $newCoach->getSexe(),
+            ':taille' => $newCoach->getTaille(),
+            ':poids' => $newCoach->getPoids(),
+            ':motDePasse' => $newCoach->getMotDePasse(),
+            ':dateNaissance' => $newCoach->getDateNaissance(), 
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteCoach(int $idCoach): array
+    public function deleteCoach(int $idCoach) {
-    {
         $query = "DELETE FROM Coach WHERE idCoach = :idCoach";
 
         $params = [

Sources/src/data/core/database/CoachMapper.php

@@ -1,7 +1,6 @@
 <?php
 
 namespace Database;
-use Model\CoachAthlete;
 use Model\User;
 use \PDO;
 use \DateTime;
@@ -9,48 +8,34 @@ use Model\Role;
 use Model\Coach;
 
 class CoachMapper {
-    public function coachSqlToEntity(array $data): array {
+    public function map(array $data) {
-        $coachEntities = [];
+        $coach = new CoachEntity();
-
+        $coach->setIdCoach($data['idCoach']);
-        foreach ($data as $coachData) {
+        $coach->setNom($data['nom']);
-            $coach = new CoachEntity();
+        $coach->setPrenom($data['prenom']);
-
+        $coach->setEmail($data['email']);
-            if (isset($coachData['idCoach'])) {
+        $coach->setSexe($data['sexe']);
-                $coach->setIdCoach($coachData['idCoach']);
+        $coach->setTaille($data['taille']);
-            }
+        $coach->setPoids($data['poids']);
-
+        $coach->setMotDePasse($data['motDePasse']);
-            if (isset($coachData['athleteId'])) {
+        $coach->setDateNaissance($data['dateNaissance']);
-                $coach->setAthleteId($coachData['athleteId']);
+        
-            }
+        return $coach;
-
-            $coachEntities[] = $coach;
-        }
-
-        return $coachEntities;
     }
 
     public function CoachEntityToModel(CoachEntity $coachEntity):User{
-        $role = new CoachAthlete();
+        $role = "Coach";
-
-        $idCoach = $coachEntity->getIdCoach();
-
-        $ath = getAthleteByCoachId($idCoach);
-        $athlete = athleteSqlToEntity($ath);
-
-        $dateSpecific = $athlete->getDateNaissance();
-        $date = new DateTime($dateSpecific);
 
         $user = new User(
             $coachEntity->getIdCoach(),
-            $athlete->getNom(),
+            $coachEntity->getNom(),
-            $athlete->getPrenom(),
+            $coachEntity->getPrenom(),
-            $athlete->getEmail(),
+            $coachEntity->getEmail(),
-            $athlete->getMotDePasse(),
+            $coachEntity->getMotDePasse(),
-            $athlete->getSexe(),
+            $coachEntity->getSexe(),
-            $athlete->getTaille(),
+            $coachEntity->getTaille(),
-            $athlete->getPoids(),
+            $coachEntity->getPoids(),
-            $athlete->getDateNaissance(),
+            $coachEntity->getDateNaissance(),
-            $date,
             $role
         );
 
@@ -61,10 +46,17 @@ class CoachMapper {
 
         $coach = new CoachEntity();
         $coach->setIdCoach($user->getId());
-        $coach->setAthleteId($user->getId());
+        $coach->setNom($user->getNom());
+        $coach->setPrenom($user->getPrenom());
+        $coach->setEmail($user->getEmail());
+        $coach->setSexe($user->getSexe());
+        $coach->setTaille($user->getTaille());
+        $coach->setPoids($user->getPoids());
+        $coach->setMotDePasse($user->getMotDePasse());
+        $coach->setDateNaissance($user->getDateNaissance());
 
         return $coach;
     }
 }
-?>
 
+?>

Sources/src/data/core/database/Connexion.php

@@ -2,9 +2,6 @@
 
 namespace Database;
 
-use DateTime;
-use Shared\Log;
-
 class Connexion extends \PDO {
     private $stmt;
 
@@ -18,14 +15,13 @@ class Connexion extends \PDO {
         }
     }
 
-    public function executeQuery(string $query, array $parameters = []) {
+    public function executeQuery(string $query, array $parameters = []): bool {
         $this->stmt = $this->prepare($query);
-//        foreach ($parameters as $name => $value) {
+        //foreach ($parameters as $name => $value) {
-//            $this->stmt->bindValue($name, $value[0], $value[1]);
+        //    $this->stmt->bindValue($name, $value[0], $value[1]);
-//        }
+        //}
         foreach ($parameters as $name => $value) {
-            $dataType = is_numeric($value) ? \PDO::PARAM_INT : \PDO::PARAM_STR;
+            $bindValueResult = $this->stmt->bindValue($name, $value, \PDO::PARAM_STR); 
-            $bindValueResult = $this->stmt->bindValue($name, $value, $dataType);
             if (!$bindValueResult) {
                 // Gérez l'erreur, par exemple, en lançant une exception.
                 throw new \PDOException('Failed to bind value for parameter ' . $name);
@@ -47,15 +43,7 @@ class Connexion extends \PDO {
     }
 
     public function getResults(): array {
-        $results = $this->stmt->fetchAll(\PDO::FETCH_ASSOC);
+        return $this->stmt->fetchAll(\PDO::FETCH_ASSOC);
-
-        // Convertissez les colonnes "taille" et "poids" en nombres
-        foreach ($results as &$row) {
-            $row['taille'] = floatval($row['taille']);
-            $row['poids'] = floatval($row['poids']);
-        }
-
-        return $results;
     }
 }
 ?>

Sources/src/data/core/database/EntrainementEntity.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace Database;
-
-class EntrainementEntity
-{
-    private $idEntrainement;
-    private $date;
-    private $description;
-    private $latitude;
-    private $longitude;
-    private $feedback;
-    private $coachId;
-
-    public function getIdEntrainement()
-    {
-        return $this->idEntrainement;
-    }
-    public function getDate()
-    {
-        return $this->date;
-    }
-    public function getDescription()
-    {
-        return $this->description;
-    }
-    public function getLatitude()
-    {
-        return $this->latitude;
-    }
-    public function getLongitude()
-    {
-        return $this->longitude;
-    }
-    public function getFeedback()
-    {
-        return $this->feedback;
-    }
-    public function getCoachId()
-    {
-        return $this->coachId;
-    }
-    public function setIdEntrainement($idEntrainement)
-    {
-        $this->idEntrainement = $idEntrainement;
-    }
-    public function setDate($date)
-    {
-        $this->date = $date;
-    }
-    public function setDescription($description)
-    {
-        $this->description = $description;
-    }
-    public function setLatitude($latitude)
-    {
-        $this->latitude = $latitude;
-    }
-    public function setLongitude($longitude)
-    {
-        $this->longitude = $longitude;
-    }
-    public function setFeedback($feedback)
-    {
-        $this->feedback = $feedback;
-    }
-    public function setCoachId($coachId)
-    {
-        $this->coachId = $coachId;
-    }
-}

Sources/src/data/core/database/EntrainementGateway.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Database;
-
-class EntrainementGateway
-{
-    private Connexion $connection;
-
-    public function __construct(Connexion $connection) {
-        $this->connection = $connection;
-    }
-
-    public function getEntrainements(): array
-    {
-        $query = "SELECT * FROM Entrainement";
-        $res = $this->connection->executeWithErrorHandling($query);
-        return $res;
-    }
-}

Sources/src/data/core/database/EntrainementMapper.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace Database;
-
-use Model\Athlete;
-use Model\Training;
-use Model\User;
-
-class EntrainementMapper
-{
-    public function entrainementSqlToEntity(array $data): array {
-        $entrainementEntities = [];
-
-        foreach ($data as $entrainementData) {
-            $entrainement = new EntrainementEntity();
-            if (isset($entrainementData['idEntrainement'])) {
-                $entrainement->setIdEntrainement($entrainementData['idEntrainement']);
-            }
-
-            if (isset($entrainementData['date'])) {
-                $entrainement->setDate($entrainementData['date']);
-            }
-
-            if (isset($entrainementData['description'])) {
-                $entrainement->setDescription($entrainementData['description']);
-            }
-
-            if (isset($entrainementData['latitude'])) {
-                $entrainement->setLatitude($entrainementData['latitude']);
-            }
-
-            if (isset($entrainementData['longitude'])) {
-                $entrainement->setLongitude($entrainementData['longitude']);
-            }
-
-            if (isset($entrainementData['feedback'])) {
-                $entrainement->setFeedback($entrainementData['feedback']);
-            }
-
-            if (isset($entrainementData['coachId'])) {
-                $entrainement->setCoachId($entrainementData['coachId']);
-            }
-
-            $entrainementEntities[] = $entrainement;
-        }
-
-        return $entrainementEntities;
-    }
-
-    public function entrainementEntityToModel(EntrainementEntity $entrainementEntity): Training {
-        return new Training(
-            $entrainementEntity->getIdEntrainement(),
-            $entrainementEntity->getDate(),
-            $entrainementEntity->getDescription(),
-            $entrainementEntity->getLatitude(),
-            $entrainementEntity->getLongitude(),
-            $entrainementEntity->getFeedback()
-        );
-    }
-
-    public function entrainementToEntity(Training $training):EntrainementEntity{
-
-        $train = new EntrainementEntity();
-        $train->setIdEntrainement($training->getId());
-        $train->setDate($training->getDate());
-        $train->setDescription($training->getDescription());
-        $train->setLatitude($training->getLatitude());
-        $train->setLongitude($training->getLongitude());
-        $train->setFeedback($training->getFeedback());
-        $train->setCoachId(1);
-
-        return $train;
-    }
-}

Sources/src/data/core/database/db.sql

@@ -1,132 +1,158 @@
-DROP TABLE IF EXISTS Athlete, Friendship, Notification, Statistique, Entrainement, Participe, SourceDonnee, Activite, FrequenceCardiaque CASCADE;
+-- Athlete Table
-
 CREATE TABLE Athlete (
-                         idAthlete SERIAL PRIMARY KEY,
+    idAthlete SERIAL PRIMARY KEY,
-                         nom VARCHAR(255),
+    nom VARCHAR(255),
-                         prenom VARCHAR(255),
+    prenom VARCHAR(255),
-                         email VARCHAR(255) UNIQUE,
+    email VARCHAR(255) UNIQUE,
-                         sexe CHAR(1),
+    sexe CHAR(1),
-                         taille DECIMAL,
+    taille DECIMAL,
-                         poids DECIMAL,
+    poids DECIMAL,
-                         motDePasse VARCHAR(255),
+    motDePasse VARCHAR(255),
-                         dateNaissance DATE,
+    dateNaissance DATE
-                         isCoach BOOLEAN
 );
 
+-- Friendship Table
 CREATE TABLE Friendship (
-                            idAthlete1 INT,
+    idAthlete1 INT,
-                            idAthlete2 INT,
+    idAthlete2 INT,
-                            debut DATE,
+    debut DATE,
-                            PRIMARY KEY (idAthlete1, idAthlete2),
+    PRIMARY KEY (idAthlete1, idAthlete2),
-                            FOREIGN KEY (idAthlete1) REFERENCES Athlete(idAthlete),
+    FOREIGN KEY (idAthlete1) REFERENCES Athlete (idAthlete),
-                            FOREIGN KEY (idAthlete2) REFERENCES Athlete(idAthlete)
+    FOREIGN KEY (idAthlete2) REFERENCES Athlete (idAthlete)
 );
 
+-- Notification Table
 CREATE TABLE Notification (
-                              idNotif INT PRIMARY KEY,
+    idNotif SERIAL PRIMARY KEY,
-                              message TEXT,
+    message TEXT,
-                              date DATE,
+    date DATE,
-                              statut BOOLEAN,
+    statut BOOLEAN,
-                              urgence INT,
+    urgence INT,
-                              athleteId INT,
+    athleteId INT,
-                              FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
+    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
+);
+
+-- Coach Table
+CREATE TABLE Coach (
+    idCoach SERIAL PRIMARY KEY,
+    athleteId INT,
+    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
 );
 
+-- Statistique Table
 CREATE TABLE Statistique (
-                             idStatistique INT PRIMARY KEY,
+    idStatistique SERIAL PRIMARY KEY,
-                             poids DECIMAL,
+    poids DECIMAL,
-                             fcMoyenne DECIMAL,
+    fcMoyenne DECIMAL,
-                             fcMax DECIMAL,
+    fcMax DECIMAL,
-                             caloriesBruleesMoy DECIMAL,
+    caloriesBruleesMoy DECIMAL,
-                             date DATE,
+    date DATE,
-                             athleteId INT,
+    athleteId INT,
-                             FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
+    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
 );
 
+-- Entrainement Table
 CREATE TABLE Entrainement (
-                              idEntrainement INT PRIMARY KEY,
+    idEntrainement SERIAL PRIMARY KEY,
-                              date DATE,
+    date DATE,
-                              description TEXT,
+    description TEXT,
-                              latitude DECIMAL,
+    latitude DECIMAL,
-                              longitude DECIMAL,
+    longitude DECIMAL,
-                              feedback TEXT,
+    feedback TEXT,
-                              athleteId INT,
+    coachId INT,
-                              FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
+    FOREIGN KEY (coachId) REFERENCES Coach (idCoach)
 );
 
+-- Participe Table
 CREATE TABLE Participe (
-                           athleteId INT,
+    athleteId INT,
-                           entrainementId INT,
+    entrainementId INT,
-                           PRIMARY KEY (athleteId, entrainementId),
+    PRIMARY KEY (athleteId, entrainementId),
-                           FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete),
+    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete),
-                           FOREIGN KEY (entrainementId) REFERENCES Entrainement(idEntrainement)
+    FOREIGN KEY (entrainementId) REFERENCES Entrainement (idEntrainement)
 );
 
+-- SourceDonnee Table
 CREATE TABLE SourceDonnee (
-                              idSource INT PRIMARY KEY,
+    idSource SERIAL PRIMARY KEY,
-                              type VARCHAR(255),
+    type VARCHAR(255),
-                              modele VARCHAR(255),
+    modele VARCHAR(255),
-                              precision2 DECIMAL,
+    precision DECIMAL,
-                              athleteId INT,
+    athleteId INT,
-                              FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
+    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
 );
 
+-- Activite Table
 CREATE TABLE Activite (
-                          idActivite INT PRIMARY KEY,
+    idActivite SERIAL PRIMARY KEY,
-                          type VARCHAR(255),
+    type VARCHAR(255),
-                          date DATE,
+    date DATE,
-                          heureDeDebut TIME,
+    heureDeDebut TIME,
-                          heureDeFin TIME,
+    heureDeFin TIME,
-                          effortRessent DECIMAL,
+    effortRessent DECIMAL,
-                          variabilite DECIMAL,
+    variabilite DECIMAL,
-                          variance DECIMAL,
+    variance DECIMAL,
-                          ecartType DECIMAL,
+    ecartType DECIMAL,
-                          moyenne DECIMAL,
+    moyenne DECIMAL,
-                          maximum DECIMAL,
+    maximum DECIMAL,
-                          minimum DECIMAL,
+    minimum DECIMAL,
-                          temperatureMoyenne DECIMAL,
+    temperatureMoyenne DECIMAL,
-                          athleteId INT,
+    athleteId INT,
-                          sourceId INT,
+    sourceId INT,
-                          FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete),
+    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete),
-                          FOREIGN KEY (sourceId) REFERENCES SourceDonnee(idSource)
+    FOREIGN KEY (sourceId) REFERENCES SourceDonnee (idSource)
 );
 
+-- FrequenceCardiaque Table
 CREATE TABLE FrequenceCardiaque (
-                                    idFc INT PRIMARY KEY,
+    idFc SERIAL PRIMARY KEY,
-                                    altitude DECIMAL,
+    altitude DECIMAL,
-                                    temps TIME,
+    temps TIME,
-                                    temperature DECIMAL,
+    temperature DECIMAL,
-                                    bpm INT,
+    bpm INT,
-                                    longitude DECIMAL,
+    longitude DECIMAL,
-                                    latitude DECIMAL,
+    latitude DECIMAL,
-                                    activiteId INT,
+    activiteId INT,
-                                    FOREIGN KEY (activiteId) REFERENCES Activite(idActivite)
+    FOREIGN KEY (activiteId) REFERENCES Activite (idActivite)
 );
 
-INSERT INTO Athlete (idAthlete, nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance, isCoach) VALUES
+-- Insertion de données dans la table Athlete
-                                                                                                                 (1, 'Doe', 'John', 'john.doe@example.com', 'M', 1.80, 70, 'password123', '1990-01-01', FALSE),
+INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) VALUES
-                                                                                                                 (2, 'Smith', 'Jane', 'jane.smith@example.com', 'F', 1.65, 60, 'password456', '1992-02-02', TRUE);
+('Doe', 'John', 'john.doe@example.com', 'M', 1.80, 70, 'password123', '1990-01-01'),
+('Smith', 'Jane', 'jane.smith@example.com', 'F', 1.65, 60, 'password456', '1992-02-02');
 
+-- Insertion de données dans la table Friendship
 INSERT INTO Friendship (idAthlete1, idAthlete2, debut) VALUES
-    (1, 2, '2023-01-01');
+(1, 2, '2023-01-01');
+
+-- Insertion de données dans la table Notification
+INSERT INTO Notification (message, date, statut, urgence, athleteId) VALUES
+('Training session at 10 AM', '2023-03-10', TRUE, 1, 1);
 
-INSERT INTO Notification (idNotif, message, date, statut, urgence, athleteId) VALUES
+-- Insertion de données dans la table Coach
-    (1, 'Training session at 10 AM', '2023-03-10', TRUE, 1, 1);
+INSERT INTO Coach (athleteId) VALUES
+(1);
 
-INSERT INTO Statistique (idStatistique, poids, fcMoyenne, fcMax, caloriesBruleesMoy, date, athleteId) VALUES
+-- Insertion de données dans la table Statistique
-    (1, 70, 80, 150, 500, '2023-03-10', 1);
+INSERT INTO Statistique (poids, fcMoyenne, fcMax, caloriesBruleesMoy, date, athleteId) VALUES
+(70, 80, 150, 500, '2023-03-10', 1);
 
-INSERT INTO Entrainement (idEntrainement, date, description, latitude, longitude, feedback, athleteId) VALUES
+-- Insertion de données dans la table Entrainement
-    (1, '2023-03-12', 'Long run in the park', 40.7128, -74.0060, 'Good effort', 1);
+INSERT INTO Entrainement (date, description, latitude, longitude, feedback, coachId) VALUES
+('2023-03-12', 'Long run in the park', 40.7128, -74.0060, 'Good effort', 1);
 
+-- Insertion de données dans la table Participe
 INSERT INTO Participe (athleteId, entrainementId) VALUES
-    (1, 1);
+(1, 1);
 
-INSERT INTO SourceDonnee (idSource, type, modele, precision2, athleteId) VALUES
+-- Insertion de données dans la table SourceDonnee
-    (1, 'Heart Rate Monitor', 'HRM-Pro', 98.5, 1);
+INSERT INTO SourceDonnee (type, modele, precision, athleteId) VALUES
+('Heart Rate Monitor', 'HRM-Pro', 98.5, 1);
 
-INSERT INTO Activite (idActivite, type, date, heureDeDebut, heureDeFin, effortRessent, variabilite, variance, ecartType, moyenne, maximum, minimum, temperatureMoyenne, athleteId, sourceId) VALUES
+-- Insertion de données dans la table Activite
-    (1, 'Running', '2023-03-10', '08:00:00', '09:00:00', 7, 0.5, 1, 0.1, 140, 160, 120, 20, 1, 1);
+INSERT INTO Activite (type, date, heureDeDebut, heureDeFin, effortRessent, variabilite, variance, ecartType, moyenne, maximum, minimum, temperatureMoyenne, athleteId, sourceId) VALUES
+('Running', '2023-03-10', '08:00:00', '09:00:00', 7, 0.5, 1, 0.1, 140, 160, 120, 20, 1, 1);
 
-INSERT INTO FrequenceCardiaque (idFc, altitude, temps, temperature, bpm, longitude, latitude, activiteId) VALUES
+-- Insertion de données dans la table FrequenceCardiaque
-    (1, 100, '08:15:00', 15, 130, -74.0060, 40.7128, 1);
+INSERT INTO FrequenceCardiaque (altitude, temps, temperature, bpm, longitude, latitude, activiteId) VALUES
+(100, '08:15:00', 15, 130, -74.0060, 40.7128, 1);

Sources/src/data/model/Activity.php

@@ -274,6 +274,5 @@ class Activity
             " et un minimum de " . $this->minimum . " bpm" .
             " et une pause automatique " . ($this->hasAutoPause ? "activée" : "désactivée") . ".\n";
     }
-
 }
 ?>

Sources/src/data/model/Training.php

@@ -35,12 +35,6 @@ class Training
     public function getLocation(): String {
         return $this->longitude . $this->latitude;
     }
-    public function getLatitude(): float {
-        return $this->latitude;
-    }
-    public function getLongitude(): float {
-        return $this->longitude;
-    }
     public function getDescription(): String
     {
         return $this->description;

Sources/src/data/model/User.php

@@ -28,7 +28,6 @@ class User {
     private \DateTime $dateNaissance;
     private Role $role;
     protected array $notifications = [];
-    private array $listFriend = [];
 
     /**
      * @return array
@@ -51,9 +50,7 @@ class User {
      * @param \DateTime $dateNaissance
      * @param \Model\Role $role
      */
-    public function __construct(int $id, string $nom, string $prenom, string $username, string $email,
+    public function __construct(int $id, string $nom, string $prenom, string $username, string $email, string $motDePasse, string $sexe, float $taille, float $poids, \DateTime $dateNaissance, Role $role)
-                                string $motDePasse, string $sexe, float $taille, float $poids, \DateTime $dateNaissance,
-                                Role $role)
     {
         $this->id = $id;
         $this->nom = $nom;
@@ -292,23 +289,5 @@ class User {
     public function __toString() {
         return "Athlete [ID: {$this->id}, Username : $this->username, Nom: {$this->nom}, Prénom: {$this->prenom}, Email: {$this->email}]";
     }
-
-    /**
-     * Donne la liste des amis de l'utilisateur
-     *
-     * @return string Les amis de l'utilisateur.
-     */
-    public function getListFriend(): array {
-        return $this->listFriend;
-    }
-    
-    /**
-     * Ajoute un utilisateur a sa liste d'amis.
-     *
-     * @param User L'utilisateur a ajouter.
-     */
-    public function addFriend(User $user){
-       array_push($this->listFriend, $user);
-    }
 }
 ?>

Sources/src/data/model/manager/UserManager.php

@@ -39,7 +39,6 @@ class UserManager
         $this->relationshipService = $relationshipService;
 
     }
-
     public function getCurrentUser(): ?User
     {
         return $this->currentUser;
@@ -82,7 +81,7 @@ class UserManager
 
     }
 
-    /*public function addFriend(string $newFriend): bool
+    public function addFriend(string $newFriend): bool
     {
         $newFriend = $this->dataManager->userRepository->getItemByName($newFriend, 0, 1);
         if ($newFriend === null) {
@@ -92,15 +91,11 @@ class UserManager
         if (in_array($newFriend, $this->currentUser->getRole()->getUsersList())) {
             throw new \Exception("Already friend");
         }
+        var_dump("====================1=========================");
         if($this->relationshipService->sendRequest($this->currentUser, $newFriend)){
             return true;
         };
         return false;
-    }*/
-
-    public function addFriend(User $user1, User $user2)
-    {
-        $this->dataManager->userRepository->addFriend($user1, $user2);
     }
 
     public function respondToFriendRequest(int $requestId, bool $choice): bool
@@ -138,16 +133,9 @@ class UserManager
     {
         return $this->dataManager->userRepository->getItemsByName($name, 0, 10);
     }
-    
+
-    public function searchUserByName(string $name): ?User
+    public function getFriends(): array{
-    {
+        return $this->currentUser->getRole()->getUsersList();
-        return $this->dataManager->userRepository->getItemByName($name, 0, 10);
-    }
-        
-    public function getFriends(): array {
-        $user=$this->dataManager->userRepository->getItemById(1);
-        return $user->getListFriend();
-        //return $this->currentUser->getRole()->getUsersList();
     }
 
     // NEED TO PERSIST
@@ -222,9 +210,5 @@ class UserManager
         return false;
     }
 
-    public function getUserById(int $id): ?User {
-        return $this->dataManager->userRepository->getItemById($id);
-    }
-
 }
 ?>

Sources/src/data/model/repository/IUserRepository.php

@@ -1,10 +1,9 @@
 <?php
 namespace Repository;
-use Model\User;
 
 interface IUserRepository extends IGenericRepository {
-   public function addFriend(User $user1,user $user2);
+   public function addFriend(int $user1,int $user2);
-    public function deleteFriend(User $user1,User $user2);
+    public function deleteFriend(int $user1,int $user2);
 
 }
 

Sources/src/data/stub/repository/UserRepository.php

@@ -32,7 +32,6 @@ class UserRepository implements IUserRepository {
         $this->users[] = new User(3, "Martin", "Paul","Martin", "paul.martin@example.com", "super789", 'M', 1.75, 68, new \DateTime("1988-08-20"), new CoachAthlete());
         $this->users[] = new User(4, "Brown", "Anna","Brown", "anna.brown@example.com", "test000", 'F', 1.70, 58, new \DateTime("1992-11-25"), new Athlete());
         $this->users[] = new User(5, "Lee", "Bruce","Lee", "bruce.lee@example.com", "hello321", 'M', 1.72, 70, new \DateTime("1970-02-05"), new Athlete());
-        $this->users[] = new User(6, "Truc", "Bruce","Truc", "bruce.lee@example.com", "hello321", 'M', 1.72, 70, new \DateTime("1970-02-05"), new Athlete());
     }
 
     /**
@@ -164,15 +163,15 @@ class UserRepository implements IUserRepository {
         return false;
     }
 
-
+    public function addFriend(int $user1, int $user2)
-    public function deleteFriend(User $user1, User $user2)
     {
-       return true;
+        return true;
     }
 
-    public function addFriend(User $user1, User $user2)
+
+    public function deleteFriend(int $user1, int $user2)
     {
-        $user1->addFriend($user2);
+       return true;
     }
 }
 ?>

Sources/tests/GatewayTest.php

@@ -1,215 +0,0 @@
-<?php
-use PHPUnit\Framework\TestCase;
-
-
-//use Database\{Connexion, AthleteGateway,AthleteEntity};
-use Database\AthleteEntity;
-use Database\AthleteGateway;
-use Database\Connexion;
-use Database\AthleteMapper;
-use Database\CoachGateway;
-use Database\CoachEntity;
-use Database\CoachMapper;
-
-class GatewayTest extends TestCase {
-
-    //Partie concernant les Athlètes
-
-    public function testGetAthlete() {
-
-        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
-
-        require "loginDatabase.php";
-
-        $connexion = new Connexion($dsn,$username,$password);
-
-
-        $athleteGateway = new AthleteGateway($connexion);
-        $result = $athleteGateway->getAthlete();
-        //var_dump($result);
-    }
-
-    /* Fonctionne mais en commentaire pour pas add et del a chaque fois
-    public function testAddAthlete(){
-        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-        $username = "kemonteiro2";
-        $password = "#Phpmyadmin63";
-
-        $connexion = new Connexion($dsn,$username,$password);
-
-
-        $athleteGateway = new AthleteGateway($connexion);
-
-        $dateSpecifique = "2023-11-26";
-        $timestamp = strtotime($dateSpecifique);
-        $dateSQL = date("Y-m-d", $timestamp);
-
-        $athleteEntity = new AthleteEntity();
-        $athleteEntity->setNom('John');
-        $athleteEntity->setPrenom('Doe');
-        $athleteEntity->setIdAthlete(1234);
-        $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
-        $athleteEntity->setSexe('H');
-        $athleteEntity->setTaille(169);
-        $athleteEntity->setPoids(69);
-        $athleteEntity->setMotDePasse('motdepasse');
-        $athleteEntity->setDateNaissance($dateSQL);
-
-        $result2 = $athleteGateway->addAthlete($athleteEntity);
-    }
-
-
-    public function testDeleteAthlete(){
-        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-        $username = "kemonteiro2";
-        $password = "#Phpmyadmin63";
-
-        $connexion = new Connexion($dsn,$username,$password);
-
-        $athleteGateway = new AthleteGateway($connexion);
-        $result = $athleteGateway->deleteAthlete( //idAthlete );
-        var_dump($result);
-
-    }*/
-
-    public function testUpdateAthlete(){
-        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-        $username = "kemonteiro2";
-        $password = "#Phpmyadmin63";
-
-        $connexion = new Connexion($dsn,$username,$password);
-
-        $athleteGateway = new AthleteGateway($connexion);
-
-        $dateSpecifique = "2004-08-26";
-        $timestamp = strtotime($dateSpecifique);
-        $dateSQL = date("Y-m-d", $timestamp);
-
-        $athleteEntity = new AthleteEntity();
-        $athleteEntity->setNom('John');
-        $athleteEntity->setPrenom('Doe');
-        $athleteEntity->setIdAthlete(13);
-        $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
-        $athleteEntity->setSexe('H');
-        $athleteEntity->setTaille(169);
-        $athleteEntity->setPoids(69);
-        $athleteEntity->setMotDePasse('motdepasse');
-        $athleteEntity->setDateNaissance($dateSQL);
-        $athleteEntity->setIsCoach(FALSE);
-        $athleteEntity->setCoachId(NULL);
-
-        $athleteEntity2 = new AthleteEntity();
-        $athleteEntity2->setNom('Monteiro');
-        $athleteEntity2->setPrenom('Kevin');
-        $athleteEntity2->setIdAthlete(13);
-        $athleteEntity2->setEmail('kevin.monteiro@gmail.fr');
-        $athleteEntity2->setSexe('H');
-        $athleteEntity2->setTaille(169);
-        $athleteEntity2->setPoids(69);
-        $athleteEntity2->setMotDePasse('motdepasse');
-        $athleteEntity2->setDateNaissance($dateSQL);
-        $athleteEntity2->setIsCoach(TRUE);
-        $athleteEntity2->setCoachId(1);
-
-        $result = $athleteGateway->updateAthlete($athleteEntity, $athleteEntity2);
-    }
-
-    //Partie concernant les Coachs
-
-    public function testGetCoach() {
-
-        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
-
-        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-        $username = "kemonteiro2";
-        $password = "#Phpmyadmin63";
-
-        $connexion = new Connexion($dsn,$username,$password);
-
-
-        $coachGateway = new CoachGateway($connexion);
-        $result = $coachGateway->getCoach();
-        var_dump($result);
-    }
-    /*
-        //Fonctionne PAS A PARTIR DE LA
-        public function testAddCoach(){
-            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-            $username = "kemonteiro2";
-            $password = "#Phpmyadmin63";
-
-            $connexion = new Connexion($dsn,$username,$password);
-
-
-            $coachGateway = new CoachGateway($connexion);
-
-            $dateSpecifique = "2023-11-26";
-            $timestamp = strtotime($dateSpecifique);
-            $dateSQL = date("Y-m-d", $timestamp);
-
-            $coachEntity = new CoachEntity();
-            $coachEntity->setNom('John');
-            $coachEntity->setPrenom('Doe');
-            $coachEntity->setIdCoach(1234);
-            $coachEntity->setEmail('kevin.monteiro@gmail.fr');
-            $coachEntity->setSexe('H');
-            $coachEntity->setTaille(169);
-            $coachEntity->setPoids(69);
-            $coachEntity->setMotDePasse('motdepasse');
-            $coachEntity->setDateNaissance($dateSQL);
-
-            $result2 = $coachGateway->addCoach($coachEntity);
-        }
-
-
-        public function testDeleteAthlete(){
-            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-            $username = "kemonteiro2";
-            $password = "#Phpmyadmin63";
-
-            $connexion = new Connexion($dsn,$username,$password);
-
-            $athleteGateway = new AthleteGateway($connexion);
-            $result = $athleteGateway->deleteAthlete( //idAthlete );
-            var_dump($result);
-
-        }*/
-    /*
-        public function testUpdateAthlete(){
-            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-            $username = "kemonteiro2";
-            $password = "#Phpmyadmin63";
-
-            $connexion = new Connexion($dsn,$username,$password);
-
-            $athleteGateway = new AthleteGateway($connexion);
-
-            $dateSpecifique = "2004-08-26";
-            $timestamp = strtotime($dateSpecifique);
-            $dateSQL = date("Y-m-d", $timestamp);
-
-            $athleteEntity = new AthleteEntity();
-            $athleteEntity->setNom('John');
-            $athleteEntity->setPrenom('Doe');
-            $athleteEntity->setIdAthlete(13);
-            $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
-            $athleteEntity->setSexe('H');
-            $athleteEntity->setTaille(169);
-            $athleteEntity->setPoids(69);
-            $athleteEntity->setMotDePasse('motdepasse');
-            $athleteEntity->setDateNaissance($dateSQL);
-
-            $athleteEntity2 = new AthleteEntity();
-            $athleteEntity2->setNom('Monteiro');
-            $athleteEntity2->setPrenom('Kevin');
-            $athleteEntity2->setIdAthlete(13);
-            $athleteEntity2->setEmail('kevin.monteiro@gmail.fr');
-            $athleteEntity2->setSexe('H');
-            $athleteEntity2->setTaille(169);
-            $athleteEntity2->setPoids(69);
-            $athleteEntity2->setMotDePasse('motdepasse');
-            $athleteEntity2->setDateNaissance($dateSQL);
-
-            $result = $athleteGateway->updateAthlete($athleteEntity, $athleteEntity2);
-        }*/
-}

Sources/tests/MapperTest.php

@@ -1,43 +0,0 @@
-<?php
-use PHPUnit\Framework\TestCase;
-
-use Model\User;
-use Database\AthleteEntity;
-use Database\AthleteGateway;
-use Database\Connexion;
-use Database\AthleteMapper;
-
-class MapperTest extends TestCase {
-
-    public function testMapperAthlete() {
-
-        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
-
-        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
-        $username = "kemonteiro2";
-        $password = "#Phpmyadmin63";
-
-        $connexion = new Connexion($dsn,$username,$password);
-
-
-        $athleteGateway = new AthleteGateway($connexion);
-        $result = $athleteGateway->getAthlete();
-
-        $map = new AthleteMapper ();
-        //SQL To AthleteEntity
-        $athleteEntity = $map->athleteSqlToEntity($result);
-
-
-        foreach($athleteEntity as $ath){
-
-            $result = $ath->getNom();
-            var_dump($result);
-            //Pour chaque AthleteEntity : Athlete Entity To User avec Role Athlete(Model)
-            $user = $map->athleteEntityToModel($ath);
-            var_dump($user->getId());
-            //Pour chaque Athlete du Model -> Athlete Entity
-            $res = $map->athleteToEntity($user);
-            var_dump($res->getIdAthlete());
-        }
-    }
-}

Sources/tests/loginDatabase.php

@@ -1,7 +0,0 @@
-<?php
-
-$dsn = "psql:host=localhost;dbname=sae_3;";
-$username = "Perederii";
-$password = "";
-
-?>

Sources/vendor/composer/autoload_classmap.php

@@ -430,6 +430,7 @@ return array(
     'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php',
     'PHPUnit\\Framework\\MockObject\\Stub\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php',
     'PHPUnit\\Framework\\NoChildTestSuiteException' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php',
+    'PHPUnit\\Framework\\PhptAssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php',
     'PHPUnit\\Framework\\ProcessIsolationException' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php',
     'PHPUnit\\Framework\\Reorderable' => $vendorDir . '/phpunit/phpunit/src/Framework/Reorderable.php',
     'PHPUnit\\Framework\\SelfDescribing' => $vendorDir . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
@@ -955,6 +956,93 @@ return array(
     'PharIo\\Version\\VersionConstraintValue' => $vendorDir . '/phar-io/version/src/VersionConstraintValue.php',
     'PharIo\\Version\\VersionNumber' => $vendorDir . '/phar-io/version/src/VersionNumber.php',
     'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
+    'SebastianBergmann\\CliParser\\AmbiguousOptionException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/AmbiguousOptionException.php',
+    'SebastianBergmann\\CliParser\\Exception' => $vendorDir . '/sebastian/cli-parser/src/exceptions/Exception.php',
+    'SebastianBergmann\\CliParser\\OptionDoesNotAllowArgumentException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/OptionDoesNotAllowArgumentException.php',
+    'SebastianBergmann\\CliParser\\Parser' => $vendorDir . '/sebastian/cli-parser/src/Parser.php',
+    'SebastianBergmann\\CliParser\\RequiredOptionArgumentMissingException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/RequiredOptionArgumentMissingException.php',
+    'SebastianBergmann\\CliParser\\UnknownOptionException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/UnknownOptionException.php',
+    'SebastianBergmann\\CodeCoverage\\BranchAndPathCoverageNotSupportedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/BranchAndPathCoverageNotSupportedException.php',
+    'SebastianBergmann\\CodeCoverage\\CodeCoverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage.php',
+    'SebastianBergmann\\CodeCoverage\\Data\\ProcessedCodeCoverageData' => $vendorDir . '/phpunit/php-code-coverage/src/Data/ProcessedCodeCoverageData.php',
+    'SebastianBergmann\\CodeCoverage\\Data\\RawCodeCoverageData' => $vendorDir . '/phpunit/php-code-coverage/src/Data/RawCodeCoverageData.php',
+    'SebastianBergmann\\CodeCoverage\\DeadCodeDetectionNotSupportedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/DeadCodeDetectionNotSupportedException.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\Driver' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/Driver.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\PathExistsButIsNotDirectoryException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/PathExistsButIsNotDirectoryException.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\PcovDriver' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/PcovDriver.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\PcovNotAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/PcovNotAvailableException.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\Selector' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/Selector.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\WriteOperationFailedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/WriteOperationFailedException.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\XdebugDriver' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/XdebugDriver.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/XdebugNotAvailableException.php',
+    'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotEnabledException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/XdebugNotEnabledException.php',
+    'SebastianBergmann\\CodeCoverage\\Exception' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/Exception.php',
+    'SebastianBergmann\\CodeCoverage\\FileCouldNotBeWrittenException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/FileCouldNotBeWrittenException.php',
+    'SebastianBergmann\\CodeCoverage\\Filter' => $vendorDir . '/phpunit/php-code-coverage/src/Filter.php',
+    'SebastianBergmann\\CodeCoverage\\InvalidArgumentException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/InvalidArgumentException.php',
+    'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverAvailableException.php',
+    'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverWithPathCoverageSupportAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverWithPathCoverageSupportAvailableException.php',
+    'SebastianBergmann\\CodeCoverage\\Node\\AbstractNode' => $vendorDir . '/phpunit/php-code-coverage/src/Node/AbstractNode.php',
+    'SebastianBergmann\\CodeCoverage\\Node\\Builder' => $vendorDir . '/phpunit/php-code-coverage/src/Node/Builder.php',
+    'SebastianBergmann\\CodeCoverage\\Node\\CrapIndex' => $vendorDir . '/phpunit/php-code-coverage/src/Node/CrapIndex.php',
+    'SebastianBergmann\\CodeCoverage\\Node\\Directory' => $vendorDir . '/phpunit/php-code-coverage/src/Node/Directory.php',
+    'SebastianBergmann\\CodeCoverage\\Node\\File' => $vendorDir . '/phpunit/php-code-coverage/src/Node/File.php',
+    'SebastianBergmann\\CodeCoverage\\Node\\Iterator' => $vendorDir . '/phpunit/php-code-coverage/src/Node/Iterator.php',
+    'SebastianBergmann\\CodeCoverage\\ParserException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/ParserException.php',
+    'SebastianBergmann\\CodeCoverage\\ReflectionException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/ReflectionException.php',
+    'SebastianBergmann\\CodeCoverage\\ReportAlreadyFinalizedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/ReportAlreadyFinalizedException.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Clover' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Clover.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Cobertura' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Cobertura.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Crap4j' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Crap4j.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Colors' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Colors.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Html\\CustomCssFile' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/CustomCssFile.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Dashboard' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Dashboard.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Directory' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Directory.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Facade' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Facade.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Html\\File' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Renderer' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\PHP' => $vendorDir . '/phpunit/php-code-coverage/src/Report/PHP.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Text' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Text.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Thresholds' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Thresholds.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\BuildInformation' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/BuildInformation.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Coverage' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Coverage.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Directory' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Directory.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Facade' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Facade.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\File' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/File.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Method' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Method.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Node' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Node.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Project' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Project.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Report' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Report.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Source' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Source.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Tests' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Tests.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Totals' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Totals.php',
+    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Unit' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Unit.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysisCacheNotConfiguredException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/StaticAnalysisCacheNotConfiguredException.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CacheWarmer' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CachingFileAnalyser' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CodeUnitFindingVisitor' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/CodeUnitFindingVisitor.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ExecutableLinesFindingVisitor' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\FileAnalyser' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/FileAnalyser.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\IgnoredLinesFindingVisitor' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/IgnoredLinesFindingVisitor.php',
+    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ParsingFileAnalyser' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/ParsingFileAnalyser.php',
+    'SebastianBergmann\\CodeCoverage\\TestIdMissingException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/TestIdMissingException.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Known' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Known.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Large' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Large.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Medium' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Medium.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Small' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Small.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\TestSize' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/TestSize.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Unknown' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Unknown.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Failure' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Failure.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Known' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Known.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Success' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Success.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\TestStatus' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/TestStatus.php',
+    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Unknown' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Unknown.php',
+    'SebastianBergmann\\CodeCoverage\\UnintentionallyCoveredCodeException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/UnintentionallyCoveredCodeException.php',
+    'SebastianBergmann\\CodeCoverage\\Util\\DirectoryCouldNotBeCreatedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/DirectoryCouldNotBeCreatedException.php',
+    'SebastianBergmann\\CodeCoverage\\Util\\Filesystem' => $vendorDir . '/phpunit/php-code-coverage/src/Util/Filesystem.php',
+    'SebastianBergmann\\CodeCoverage\\Util\\Percentage' => $vendorDir . '/phpunit/php-code-coverage/src/Util/Percentage.php',
+    'SebastianBergmann\\CodeCoverage\\Version' => $vendorDir . '/phpunit/php-code-coverage/src/Version.php',
+    'SebastianBergmann\\CodeCoverage\\XmlException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/XmlException.php',
     'SebastianBergmann\\CodeUnitReverseLookup\\Wizard' => $vendorDir . '/sebastian/code-unit-reverse-lookup/src/Wizard.php',
     'SebastianBergmann\\CodeUnit\\ClassMethodUnit' => $vendorDir . '/sebastian/code-unit/src/ClassMethodUnit.php',
     'SebastianBergmann\\CodeUnit\\ClassUnit' => $vendorDir . '/sebastian/code-unit/src/ClassUnit.php',

Sources/vendor/composer/autoload_psr4.php

@@ -12,21 +12,24 @@ return array(
     'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
     'Stub\\' => array($baseDir . '/src/data/stub', $baseDir . '/src/data/stub/service', $baseDir . '/src/data/stub/repository'),
+    'Repository\\' => array($baseDir . '/src/data/model/repository'),
+    'Network\\' => array($baseDir . '/src/data/core/network'),
+    'Model\\' => array($baseDir . '/src/data/model'),
+    'Manager\\' => array($baseDir . '/src/data/model/manager'),
+    'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
+    'Data\\' => array($baseDir . '/src/data'),
     'Shared\\Exception\\' => array($baseDir . '/src/shared/exception'),
     'Shared\\Attributes\\' => array($baseDir . '/src/shared/attributes'),
     'Shared\\' => array($baseDir . '/src/shared'),
-    'Repository\\' => array($baseDir . '/src/data/model/repository'),
+    'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
-    'Psr\\Container\\' => array($vendorDir . '/psr/container/src', $vendorDir . '/sebastian/cli-parser/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
-    'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption', $vendorDir . '/phpunit/php-code-coverage/src/PhpOption'),
+    'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption'),
+    'Repository\\' => array($baseDir . '/src/data/model/repository'),
     'Network\\' => array($baseDir . '/src/data/core/network'),
-    'Model\\' => array($baseDir . '/src/data/model'),
-    'Manager\\' => array($baseDir . '/src/data/model/manager'),
     'Hearttrack\\' => array($baseDir . '/src'),
     'GrahamCampbell\\ResultType\\' => array($vendorDir . '/graham-campbell/result-type/src'),
     'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
     'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
-    'Database\\' => array($baseDir . '/src/data/core/database'),
     'Data\\Core\\' => array($baseDir . '/src/data/core'),
     'Data\\' => array($baseDir . '/src/data'),
     'Console\\' => array($baseDir . '/src/console'),

Sources/vendor/composer/autoload_static.php

@@ -63,10 +63,10 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'D' => 
         array (
             'Dotenv\\' => 7,
+            'Data\\' => 5,
+            'Doctrine\\Instantiator\\' => 22,
             'DeepCopy\\' => 9,
-            'Database\\' => 9,
             'Data\\Core\\' => 10,
-            'Data\\' => 5,
         ),
         'C' => 
         array (
@@ -105,32 +105,31 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
         ),
-        'Stub\\' => 
+        'Stub\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/data/stub',
             1 => __DIR__ . '/../..' . '/src/data/stub/service',
             2 => __DIR__ . '/../..' . '/src/data/stub/repository',
         ),
-        'Shared\\Exception\\' => 
+        'Shared\\Exception\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/shared/exception',
         ),
-        'Shared\\Attributes\\' => 
+        'Shared\\Attributes\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/shared/attributes',
         ),
-        'Shared\\' => 
+        'Shared\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/shared',
         ),
-        'Repository\\' => 
+        'Repository\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/data/model/repository',
         ),
-        'Psr\\Container\\' => 
+        'Psr\\Container\\' =>
         array (
             0 => __DIR__ . '/..' . '/psr/container/src',
-            1 => __DIR__ . '/..' . '/sebastian/cli-parser/src',
         ),
         'PhpParser\\' => 
         array (
@@ -139,9 +138,8 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'PhpOption\\' => 
         array (
             0 => __DIR__ . '/..' . '/phpoption/phpoption/src/PhpOption',
-            1 => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/PhpOption',
         ),
-        'Network\\' => 
+        'Network\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/data/core/network',
         ),
@@ -153,7 +151,7 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         array (
             0 => __DIR__ . '/../..' . '/src/data/model/manager',
         ),
-        'Hearttrack\\' => 
+        'Hearttrack\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src',
         ),
@@ -165,15 +163,19 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         array (
             0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src',
         ),
-        'DeepCopy\\' => 
+        'Doctrine\\Instantiator\\' =>
         array (
-            0 => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy',
+            0 => __DIR__ . '/..' . '/graham-campbell/result-type/src',
         ),
-        'Database\\' => 
+        'Dotenv\\' => 
         array (
-            0 => __DIR__ . '/../..' . '/src/data/core/database',
+            0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src',
+        ),
+        'DeepCopy\\' =>
+        array (
+            0 => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy',
         ),
-        'Data\\Core\\' => 
+        'Data\\Core\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/data/core',
         ),
@@ -185,7 +187,7 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         array (
             0 => __DIR__ . '/../..' . '/src/console',
         ),
-        'App\\Views\\Directives\\' => 
+        'App\\Views\\Directives\\' =>
         array (
             0 => __DIR__ . '/../..' . '/src/app/views/directives',
         ),
@@ -640,6 +642,7 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php',
         'PHPUnit\\Framework\\MockObject\\Stub\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php',
         'PHPUnit\\Framework\\NoChildTestSuiteException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php',
+        'PHPUnit\\Framework\\PhptAssertionFailedError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php',
         'PHPUnit\\Framework\\ProcessIsolationException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php',
         'PHPUnit\\Framework\\Reorderable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Reorderable.php',
         'PHPUnit\\Framework\\SelfDescribing' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
@@ -1165,6 +1168,93 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'PharIo\\Version\\VersionConstraintValue' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintValue.php',
         'PharIo\\Version\\VersionNumber' => __DIR__ . '/..' . '/phar-io/version/src/VersionNumber.php',
         'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
+        'SebastianBergmann\\CliParser\\AmbiguousOptionException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/AmbiguousOptionException.php',
+        'SebastianBergmann\\CliParser\\Exception' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/Exception.php',
+        'SebastianBergmann\\CliParser\\OptionDoesNotAllowArgumentException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/OptionDoesNotAllowArgumentException.php',
+        'SebastianBergmann\\CliParser\\Parser' => __DIR__ . '/..' . '/sebastian/cli-parser/src/Parser.php',
+        'SebastianBergmann\\CliParser\\RequiredOptionArgumentMissingException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/RequiredOptionArgumentMissingException.php',
+        'SebastianBergmann\\CliParser\\UnknownOptionException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/UnknownOptionException.php',
+        'SebastianBergmann\\CodeCoverage\\BranchAndPathCoverageNotSupportedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/BranchAndPathCoverageNotSupportedException.php',
+        'SebastianBergmann\\CodeCoverage\\CodeCoverage' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/CodeCoverage.php',
+        'SebastianBergmann\\CodeCoverage\\Data\\ProcessedCodeCoverageData' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Data/ProcessedCodeCoverageData.php',
+        'SebastianBergmann\\CodeCoverage\\Data\\RawCodeCoverageData' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Data/RawCodeCoverageData.php',
+        'SebastianBergmann\\CodeCoverage\\DeadCodeDetectionNotSupportedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/DeadCodeDetectionNotSupportedException.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\Driver' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/Driver.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\PathExistsButIsNotDirectoryException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/PathExistsButIsNotDirectoryException.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\PcovDriver' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/PcovDriver.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\PcovNotAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/PcovNotAvailableException.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\Selector' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/Selector.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\WriteOperationFailedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/WriteOperationFailedException.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\XdebugDriver' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/XdebugDriver.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/XdebugNotAvailableException.php',
+        'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotEnabledException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/XdebugNotEnabledException.php',
+        'SebastianBergmann\\CodeCoverage\\Exception' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/Exception.php',
+        'SebastianBergmann\\CodeCoverage\\FileCouldNotBeWrittenException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/FileCouldNotBeWrittenException.php',
+        'SebastianBergmann\\CodeCoverage\\Filter' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Filter.php',
+        'SebastianBergmann\\CodeCoverage\\InvalidArgumentException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/InvalidArgumentException.php',
+        'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverAvailableException.php',
+        'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverWithPathCoverageSupportAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverWithPathCoverageSupportAvailableException.php',
+        'SebastianBergmann\\CodeCoverage\\Node\\AbstractNode' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/AbstractNode.php',
+        'SebastianBergmann\\CodeCoverage\\Node\\Builder' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/Builder.php',
+        'SebastianBergmann\\CodeCoverage\\Node\\CrapIndex' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/CrapIndex.php',
+        'SebastianBergmann\\CodeCoverage\\Node\\Directory' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/Directory.php',
+        'SebastianBergmann\\CodeCoverage\\Node\\File' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/File.php',
+        'SebastianBergmann\\CodeCoverage\\Node\\Iterator' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/Iterator.php',
+        'SebastianBergmann\\CodeCoverage\\ParserException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/ParserException.php',
+        'SebastianBergmann\\CodeCoverage\\ReflectionException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/ReflectionException.php',
+        'SebastianBergmann\\CodeCoverage\\ReportAlreadyFinalizedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/ReportAlreadyFinalizedException.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Clover' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Clover.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Cobertura' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Cobertura.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Crap4j' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Crap4j.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Colors' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Colors.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Html\\CustomCssFile' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/CustomCssFile.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Dashboard' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Dashboard.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Directory' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Directory.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Facade' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Facade.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Html\\File' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Renderer' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\PHP' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/PHP.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Text' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Text.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Thresholds' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Thresholds.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\BuildInformation' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/BuildInformation.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Coverage' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Coverage.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Directory' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Directory.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Facade' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Facade.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\File' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/File.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Method' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Method.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Node' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Node.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Project' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Project.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Report' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Report.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Source' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Source.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Tests' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Tests.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Totals' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Totals.php',
+        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Unit' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Unit.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysisCacheNotConfiguredException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/StaticAnalysisCacheNotConfiguredException.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CacheWarmer' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CachingFileAnalyser' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CodeUnitFindingVisitor' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/CodeUnitFindingVisitor.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ExecutableLinesFindingVisitor' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\FileAnalyser' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/FileAnalyser.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\IgnoredLinesFindingVisitor' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/IgnoredLinesFindingVisitor.php',
+        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ParsingFileAnalyser' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/ParsingFileAnalyser.php',
+        'SebastianBergmann\\CodeCoverage\\TestIdMissingException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/TestIdMissingException.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Known' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Known.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Large' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Large.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Medium' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Medium.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Small' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Small.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\TestSize' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/TestSize.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Unknown' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Unknown.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Failure' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Failure.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Known' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Known.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Success' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Success.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\TestStatus' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/TestStatus.php',
+        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Unknown' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Unknown.php',
+        'SebastianBergmann\\CodeCoverage\\UnintentionallyCoveredCodeException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/UnintentionallyCoveredCodeException.php',
+        'SebastianBergmann\\CodeCoverage\\Util\\DirectoryCouldNotBeCreatedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/DirectoryCouldNotBeCreatedException.php',
+        'SebastianBergmann\\CodeCoverage\\Util\\Filesystem' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Util/Filesystem.php',
+        'SebastianBergmann\\CodeCoverage\\Util\\Percentage' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Util/Percentage.php',
+        'SebastianBergmann\\CodeCoverage\\Version' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Version.php',
+        'SebastianBergmann\\CodeCoverage\\XmlException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/XmlException.php',
         'SebastianBergmann\\CodeUnitReverseLookup\\Wizard' => __DIR__ . '/..' . '/sebastian/code-unit-reverse-lookup/src/Wizard.php',
         'SebastianBergmann\\CodeUnit\\ClassMethodUnit' => __DIR__ . '/..' . '/sebastian/code-unit/src/ClassMethodUnit.php',
         'SebastianBergmann\\CodeUnit\\ClassUnit' => __DIR__ . '/..' . '/sebastian/code-unit/src/ClassUnit.php',