From 3166b2335396e2f6793e47d3d1569f1c83e2b6ee Mon Sep 17 00:00:00 2001
From: Sofiane Lasri <alasri250@gmail.com>
Date: Mon, 17 Oct 2022 08:39:26 +0200
Subject: [PATCH] Refacto de l'architecture du code.
---
TP2/ex4/Auteur.php | 4 ++--
TP2/ex4/init.php | 2 +-
TP2/ex4/process.php | 2 +-
TP3/model/Voiture.php | 10 +++++-----
TP4/ex0/modele/auteur.php | 4 ++--
TP4/ex0/routeur.php | 2 +-
.../config/{connexion.php => Database.php} | 4 ++--
.../ControleurAuteur.php} | 20 +++++++++----------
TP4/ex1/index.php | 13 ++++++++++++
TP4/ex1/{modele => models}/Adherent.php | 0
TP4/ex1/{modele => models}/Auteur.php | 4 ++--
TP4/ex1/{modele => models}/Categorie.php | 0
TP4/ex1/{modele => models}/DateEmprunt.php | 0
TP4/ex1/{modele => models}/Genre.php | 0
TP4/ex1/{modele => models}/Livre.php | 0
TP4/ex1/{modele => models}/Nationalite.php | 0
TP4/ex1/{ => resources}/css/styles.css | 0
TP4/ex1/{vue => resources/views}/debut.php | 0
TP4/ex1/{vue => resources/views}/fin.html | 0
.../{vue => resources/views}/lesAuteurs.php | 0
TP4/ex1/resources/views/menu.html | 3 +++
TP4/ex1/{vue => resources/views}/unAuteur.php | 0
TP4/ex1/routeur.php | 10 ----------
TP4/ex1/vue/menu.html | 3 ---
24 files changed, 42 insertions(+), 39 deletions(-)
rename TP4/ex1/config/{connexion.php => Database.php} (93%)
rename TP4/ex1/{controleur/controleurAuteur.php => controller/ControleurAuteur.php} (54%)
create mode 100644 TP4/ex1/index.php
rename TP4/ex1/{modele => models}/Adherent.php (100%)
rename TP4/ex1/{modele => models}/Auteur.php (94%)
rename TP4/ex1/{modele => models}/Categorie.php (100%)
rename TP4/ex1/{modele => models}/DateEmprunt.php (100%)
rename TP4/ex1/{modele => models}/Genre.php (100%)
rename TP4/ex1/{modele => models}/Livre.php (100%)
rename TP4/ex1/{modele => models}/Nationalite.php (100%)
rename TP4/ex1/{ => resources}/css/styles.css (100%)
rename TP4/ex1/{vue => resources/views}/debut.php (100%)
rename TP4/ex1/{vue => resources/views}/fin.html (100%)
rename TP4/ex1/{vue => resources/views}/lesAuteurs.php (100%)
create mode 100644 TP4/ex1/resources/views/menu.html
rename TP4/ex1/{vue => resources/views}/unAuteur.php (100%)
delete mode 100644 TP4/ex1/routeur.php
delete mode 100644 TP4/ex1/vue/menu.html
diff --git a/TP2/ex4/Auteur.php b/TP2/ex4/Auteur.php
index cb44f0e..6e13f12 100644
--- a/TP2/ex4/Auteur.php
+++ b/TP2/ex4/Auteur.php
@@ -24,7 +24,7 @@ class Auteur
$this->nationalite = $nationalite;
$this->anneeNaissance = $anneeNaissance;
}else{
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->prepare("SELECT * FROM auteur WHERE numAuteur = ?");
@@ -128,7 +128,7 @@ class Auteur
public static function getAllAuteurs(): array
{
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->query("SELECT * FROM auteur");
diff --git a/TP2/ex4/init.php b/TP2/ex4/init.php
index ee8b44a..216b117 100644
--- a/TP2/ex4/init.php
+++ b/TP2/ex4/init.php
@@ -4,7 +4,7 @@ require "Auteur.php";
$createTable = "CREATE TABLE IF NOT EXISTS auteur ( `numAuteur` INT NOT NULL AUTO_INCREMENT , `nom` VARCHAR(64) NOT NULL , `prenom` VARCHAR(64) NOT NULL , `nationalite` VARCHAR(32) NOT NULL , `anneeNaissance` INT NOT NULL , PRIMARY KEY (`numAuteur`)) ENGINE = InnoDB;";
-$bdd = new Connexion;
+$bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->query($createTable);
diff --git a/TP2/ex4/process.php b/TP2/ex4/process.php
index d59dc00..2f7148f 100644
--- a/TP2/ex4/process.php
+++ b/TP2/ex4/process.php
@@ -1,7 +1,7 @@
<?php
if(!empty($_POST)){
if(!empty($_POST['nom']) && !empty($_POST['prenom']) && !empty($_POST['nationalite']) && !empty($_POST['anneeNaissance'])){
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->prepare("INSERT INTO auteur (nom, prenom, nationalite, anneeNaissance) VALUE (?,?,?,?)");
diff --git a/TP3/model/Voiture.php b/TP3/model/Voiture.php
index 00ede46..da2c5a5 100644
--- a/TP3/model/Voiture.php
+++ b/TP3/model/Voiture.php
@@ -55,7 +55,7 @@ class Voiture{
}
public static function getAllVoitures(){
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->query("SELECT * FROM voiture");
@@ -63,7 +63,7 @@ class Voiture{
}
public static function rechercherParPlaque($plaque){
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->prepare("SELECT * FROM voiture WHERE immatriculation=?");
@@ -72,7 +72,7 @@ class Voiture{
}
public static function deleteVoitureByImmat($plaque){
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->prepare("DELETE FROM voiture WHERE immatriculation=?");
@@ -80,7 +80,7 @@ class Voiture{
}
public static function addVoiture($immat, $marque, $couleur){
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->prepare("INSERT INTO `voiture` (`immatriculation`, `marque`, `couleur`) VALUES (?,?,?)");
@@ -88,7 +88,7 @@ class Voiture{
}
public static function updateVoiture($immat, $marque, $couleur){
- $bdd = new Connexion;
+ $bdd = new Database;
$bdd->connect();
$bdd = $bdd->pdo();
$query = $bdd->prepare("UPDATE `voiture` SET `marque` = ?, `couleur` = ? WHERE `immatriculation` = ?");
diff --git a/TP4/ex0/modele/auteur.php b/TP4/ex0/modele/auteur.php
index 337d42f..87e37b3 100644
--- a/TP4/ex0/modele/auteur.php
+++ b/TP4/ex0/modele/auteur.php
@@ -39,7 +39,7 @@ class Auteur {
// écriture de la requête
$requete = "SELECT * FROM Auteur;";
// envoi de la requête et stockage de la réponse
- $resultat = Connexion::pdo()->query($requete);
+ $resultat = Database::pdo()->query($requete);
// traitement de la réponse
$resultat->setFetchmode(PDO::FETCH_CLASS,'Auteur');
$tableau = $resultat->fetchAll();
@@ -50,7 +50,7 @@ class Auteur {
public static function getAuteurByNum($numAuteur) {
// écriture de la requête
$requetePreparee = "SELECT * FROM Auteur WHERE numAuteur = :num_tag;";
- $req_prep = Connexion::pdo()->prepare($requetePreparee);
+ $req_prep = Database::pdo()->prepare($requetePreparee);
// le tableau des valeurs
$valeurs = array("num_tag" => $numAuteur);
try {
diff --git a/TP4/ex0/routeur.php b/TP4/ex0/routeur.php
index e02b697..640a9ba 100644
--- a/TP4/ex0/routeur.php
+++ b/TP4/ex0/routeur.php
@@ -1,6 +1,6 @@
<?php
require_once("config/connexion.php");
- Connexion::connect();
+ Database::connect();
require_once("controleur/controleurAuteur.php");
$action = "lireAuteurs";
if (isset($_GET["action"]) && in_array($_GET["action"],get_class_methods('ControleurAuteur'))) {
diff --git a/TP4/ex1/config/connexion.php b/TP4/ex1/config/Database.php
similarity index 93%
rename from TP4/ex1/config/connexion.php
rename to TP4/ex1/config/Database.php
index 27af8d9..3c66dc5 100644
--- a/TP4/ex1/config/connexion.php
+++ b/TP4/ex1/config/Database.php
@@ -1,6 +1,6 @@
<?php
-class Connexion
+class Database
{
// les attributs static caractéristiques de la connexion
static private $hostname = 'localhost';
@@ -31,7 +31,7 @@ class Connexion
self::$pdo = new PDO("mysql:host=$h;dbname=$d", $l, $p, $t);
self::$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} catch (PDOException $e) {
- echo "erreur de connexion : " . $e->getMessage() . "<br>";
+ echo "Erreur de connexion : " . $e->getMessage() . "<br>";
}
}
}
diff --git a/TP4/ex1/controleur/controleurAuteur.php b/TP4/ex1/controller/ControleurAuteur.php
similarity index 54%
rename from TP4/ex1/controleur/controleurAuteur.php
rename to TP4/ex1/controller/ControleurAuteur.php
index 1f6d2d9..a90cb64 100644
--- a/TP4/ex1/controleur/controleurAuteur.php
+++ b/TP4/ex1/controller/ControleurAuteur.php
@@ -1,5 +1,5 @@
<?php
- require_once("modele/Auteur.php");
+ require_once("models/Auteur.php");
class ControleurAuteur {
@@ -11,23 +11,23 @@
$numAuteur = $auteur->getNumAuteur();
$nom = $auteur->getNom();
$prenom = $auteur->getPrenom();
- $lienDetails = "<a class='bouton' href=\"routeur.php?controleur=controleurAuteur&action=lireAuteur&numAuteur=$numAuteur\"> détails </a>";
+ $lienDetails = "<a class='bouton' href=\"index.php?controller=controleurAuteur&action=lireAuteur&numAuteur=$numAuteur\"> détails </a>";
$tableauAffichage[] = "<div class='ligne'><div>Auteur $prenom $nom</div><div> $lienDetails</div></div>";
}
- include("vue/debut.php");
- include("vue/menu.html");
- include("vue/lesAuteurs.php");
- include("vue/fin.html");
+ include("resources/views/debut.php");
+ include("resources/views/menu.html");
+ include("resources/views/lesAuteurs.php");
+ include("resources/views/fin.html");
}
public static function lireAuteur() {
$titre = "un auteur";
$numAuteur = $_GET["numAuteur"];
$auteur = Auteur::getAuteurByNum($numAuteur);
- include("vue/debut.php");
- include("vue/menu.html");
- include("vue/unAuteur.php");
- include("vue/fin.html");
+ include("resources/views/debut.php");
+ include("resources/views/menu.html");
+ include("resources/views/unAuteur.php");
+ include("resources/views/fin.html");
}
}
diff --git a/TP4/ex1/index.php b/TP4/ex1/index.php
new file mode 100644
index 0000000..78b8ba9
--- /dev/null
+++ b/TP4/ex1/index.php
@@ -0,0 +1,13 @@
+<?php
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
+require_once("config/Database.php");
+Database::connect();
+require_once("controller/ControleurAuteur.php");
+$action = "lireAuteurs";
+if (isset($_GET["action"]) && in_array($_GET["action"], get_class_methods('ControleurAuteur'))) {
+ $action = $_GET["action"];
+}
+controleurAuteur::$action();
+?>
diff --git a/TP4/ex1/modele/Adherent.php b/TP4/ex1/models/Adherent.php
similarity index 100%
rename from TP4/ex1/modele/Adherent.php
rename to TP4/ex1/models/Adherent.php
diff --git a/TP4/ex1/modele/Auteur.php b/TP4/ex1/models/Auteur.php
similarity index 94%
rename from TP4/ex1/modele/Auteur.php
rename to TP4/ex1/models/Auteur.php
index 337d42f..87e37b3 100644
--- a/TP4/ex1/modele/Auteur.php
+++ b/TP4/ex1/models/Auteur.php
@@ -39,7 +39,7 @@ class Auteur {
// écriture de la requête
$requete = "SELECT * FROM Auteur;";
// envoi de la requête et stockage de la réponse
- $resultat = Connexion::pdo()->query($requete);
+ $resultat = Database::pdo()->query($requete);
// traitement de la réponse
$resultat->setFetchmode(PDO::FETCH_CLASS,'Auteur');
$tableau = $resultat->fetchAll();
@@ -50,7 +50,7 @@ class Auteur {
public static function getAuteurByNum($numAuteur) {
// écriture de la requête
$requetePreparee = "SELECT * FROM Auteur WHERE numAuteur = :num_tag;";
- $req_prep = Connexion::pdo()->prepare($requetePreparee);
+ $req_prep = Database::pdo()->prepare($requetePreparee);
// le tableau des valeurs
$valeurs = array("num_tag" => $numAuteur);
try {
diff --git a/TP4/ex1/modele/Categorie.php b/TP4/ex1/models/Categorie.php
similarity index 100%
rename from TP4/ex1/modele/Categorie.php
rename to TP4/ex1/models/Categorie.php
diff --git a/TP4/ex1/modele/DateEmprunt.php b/TP4/ex1/models/DateEmprunt.php
similarity index 100%
rename from TP4/ex1/modele/DateEmprunt.php
rename to TP4/ex1/models/DateEmprunt.php
diff --git a/TP4/ex1/modele/Genre.php b/TP4/ex1/models/Genre.php
similarity index 100%
rename from TP4/ex1/modele/Genre.php
rename to TP4/ex1/models/Genre.php
diff --git a/TP4/ex1/modele/Livre.php b/TP4/ex1/models/Livre.php
similarity index 100%
rename from TP4/ex1/modele/Livre.php
rename to TP4/ex1/models/Livre.php
diff --git a/TP4/ex1/modele/Nationalite.php b/TP4/ex1/models/Nationalite.php
similarity index 100%
rename from TP4/ex1/modele/Nationalite.php
rename to TP4/ex1/models/Nationalite.php
diff --git a/TP4/ex1/css/styles.css b/TP4/ex1/resources/css/styles.css
similarity index 100%
rename from TP4/ex1/css/styles.css
rename to TP4/ex1/resources/css/styles.css
diff --git a/TP4/ex1/vue/debut.php b/TP4/ex1/resources/views/debut.php
similarity index 100%
rename from TP4/ex1/vue/debut.php
rename to TP4/ex1/resources/views/debut.php
diff --git a/TP4/ex1/vue/fin.html b/TP4/ex1/resources/views/fin.html
similarity index 100%
rename from TP4/ex1/vue/fin.html
rename to TP4/ex1/resources/views/fin.html
diff --git a/TP4/ex1/vue/lesAuteurs.php b/TP4/ex1/resources/views/lesAuteurs.php
similarity index 100%
rename from TP4/ex1/vue/lesAuteurs.php
rename to TP4/ex1/resources/views/lesAuteurs.php
diff --git a/TP4/ex1/resources/views/menu.html b/TP4/ex1/resources/views/menu.html
new file mode 100644
index 0000000..80916a3
--- /dev/null
+++ b/TP4/ex1/resources/views/menu.html
@@ -0,0 +1,3 @@
+<nav>
+ <a href="index.php?action=lireAuteurs">tous les auteurs</a>
+</nav>
diff --git a/TP4/ex1/vue/unAuteur.php b/TP4/ex1/resources/views/unAuteur.php
similarity index 100%
rename from TP4/ex1/vue/unAuteur.php
rename to TP4/ex1/resources/views/unAuteur.php
diff --git a/TP4/ex1/routeur.php b/TP4/ex1/routeur.php
deleted file mode 100644
index e02b697..0000000
--- a/TP4/ex1/routeur.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
- require_once("config/connexion.php");
- Connexion::connect();
- require_once("controleur/controleurAuteur.php");
- $action = "lireAuteurs";
- if (isset($_GET["action"]) && in_array($_GET["action"],get_class_methods('ControleurAuteur'))) {
- $action = $_GET["action"];
- }
- controleurAuteur::$action();
-?>
diff --git a/TP4/ex1/vue/menu.html b/TP4/ex1/vue/menu.html
deleted file mode 100644
index dc225ff..0000000
--- a/TP4/ex1/vue/menu.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<nav>
- <a href="routeur.php?action=lireAuteurs">tous les auteurs</a>
-</nav>
--
GitLab