From 92037e013922b47b4bc8d4c5072fcb86f5ec26a9 Mon Sep 17 00:00:00 2001
From: Emmanuel ROY <emmanuel.roy1@ac-besancon.fr>
Date: Thu, 14 Mar 2019 16:48:02 +0100
Subject: [PATCH] initial commmit de la branche Nude with composer

---
 .../{application.class.php => Application.php}      |  8 ++------
 application/class/{bdd.class.php => Bdd.php}        |  2 ++
 .../{controlleur.class.php => Controlleur.php}      |  9 ++++-----
 application/class/{dumper.class.php => Dumper.php}  |  3 +++
 application/class/{modele.class.php => Modele.php}  |  2 ++
 application/class/{tri.class.php => Tri.php}        |  9 +++------
 application/class/{url.class.php => Url.php}        | 13 ++++++++-----
 application/class/{vue.class.php => Vue.php}        |  2 ++
 application/include/vues/accueil.phtml              |  9 ++-------
 application/layout/include/standard/header.phtml    |  2 +-
 application/parameters.php                          |  2 +-
 composer.json                                       |  8 ++++++++
 public/index.php                                    |  8 ++++----
 13 files changed, 42 insertions(+), 35 deletions(-)
 rename application/class/{application.class.php => Application.php} (59%)
 rename application/class/{bdd.class.php => Bdd.php} (97%)
 rename application/class/{controlleur.class.php => Controlleur.php} (77%)
 rename application/class/{dumper.class.php => Dumper.php} (85%)
 rename application/class/{modele.class.php => Modele.php} (96%)
 rename application/class/{tri.class.php => Tri.php} (65%)
 rename application/class/{url.class.php => Url.php} (86%)
 rename application/class/{vue.class.php => Vue.php} (95%)
 create mode 100644 composer.json

diff --git a/application/class/application.class.php b/application/class/Application.php
similarity index 59%
rename from application/class/application.class.php
rename to application/class/Application.php
index a0a3ae6..e2ea8fb 100644
--- a/application/class/application.class.php
+++ b/application/class/Application.php
@@ -1,12 +1,8 @@
 <?php
 
-define( "CONTROLLERS_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "include" . DIRECTORY_SEPARATOR . "controlleurs");
-define( "OBJETS_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "objets");
+namespace MVC\Classe;
 
-require CLASSES_PATH.DIRECTORY_SEPARATOR."url.class.php";
-require CLASSES_PATH.DIRECTORY_SEPARATOR."controlleur.class.php";
-require CLASSES_PATH.DIRECTORY_SEPARATOR."bdd.class.php";
-require CLASSES_PATH.DIRECTORY_SEPARATOR."dumper.class.php";
+define( "CONTROLLERS_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "include" . DIRECTORY_SEPARATOR . "controlleurs");
 
 require APPLICATION_PATH . DIRECTORY_SEPARATOR . "parameters.php";
 
diff --git a/application/class/bdd.class.php b/application/class/Bdd.php
similarity index 97%
rename from application/class/bdd.class.php
rename to application/class/Bdd.php
index 74dfd36..4510b78 100644
--- a/application/class/bdd.class.php
+++ b/application/class/Bdd.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MVC\Classe;
+
 class Bdd
 {
     public $bdd;
diff --git a/application/class/controlleur.class.php b/application/class/Controlleur.php
similarity index 77%
rename from application/class/controlleur.class.php
rename to application/class/Controlleur.php
index f304831..b58d18d 100644
--- a/application/class/controlleur.class.php
+++ b/application/class/Controlleur.php
@@ -1,13 +1,12 @@
 <?php
 
+namespace MVC\Classe;
+
 define( "MODELS_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "include" . DIRECTORY_SEPARATOR . "modeles");
 define( "VIEW_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "include" . DIRECTORY_SEPARATOR . "vues");
 define( "CONTROLLER_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "include" . DIRECTORY_SEPARATOR . "controlleurs");
 define( "TRAITEMENT_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "traitements");
 
-require CLASSES_PATH.DIRECTORY_SEPARATOR."modele.class.php";
-require CLASSES_PATH.DIRECTORY_SEPARATOR."vue.class.php";
-
 class Controlleur{
 	
 	public $modele;
@@ -19,8 +18,8 @@ class Controlleur{
             $url_params = $application->url->page['params'];
 	        require TRAITEMENT_PATH . DIRECTORY_SEPARATOR . $application->url->page['name'] . '.php';
         } else {
-            $this->modele = new Modele($application->url->page);
-            $this->vue = new Vue($this);
+            $this->modele = new modele($application->url->page);
+            $this->vue = new vue($this);
         }
 	}
 	
diff --git a/application/class/dumper.class.php b/application/class/Dumper.php
similarity index 85%
rename from application/class/dumper.class.php
rename to application/class/Dumper.php
index fe5fcf4..c266080 100644
--- a/application/class/dumper.class.php
+++ b/application/class/Dumper.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MVC\Classe;
+
+
 class Dumper{
 
     public static function dump($var){
diff --git a/application/class/modele.class.php b/application/class/Modele.php
similarity index 96%
rename from application/class/modele.class.php
rename to application/class/Modele.php
index f63204a..663a208 100644
--- a/application/class/modele.class.php
+++ b/application/class/Modele.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MVC\Classe;
+
 class Modele{
 	
 	public $page;
diff --git a/application/class/tri.class.php b/application/class/Tri.php
similarity index 65%
rename from application/class/tri.class.php
rename to application/class/Tri.php
index e10e71d..75b3278 100644
--- a/application/class/tri.class.php
+++ b/application/class/Tri.php
@@ -1,10 +1,7 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: roy
- * Date: 05/03/2019
- * Time: 16:08
- */
+
+namespace MVC\Classe;
+
 class Tri{
 
     public static function cmp($a,$b){
diff --git a/application/class/url.class.php b/application/class/Url.php
similarity index 86%
rename from application/class/url.class.php
rename to application/class/Url.php
index a3207be..e6883cc 100644
--- a/application/class/url.class.php
+++ b/application/class/Url.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MVC\Classe;
+
 class Url
 {
 	public $page;
@@ -19,14 +21,15 @@ class Url
 	$urlTrim = trim( $url['path'] , '/' );
 	$urlParts = explode('/' , $urlTrim );
 
-	array_shift($urlParts);
-	array_shift($urlParts);
-
 	//print_r($urlParts);
-	//Récupération du nom de la page
-	($urlParts[0] == 'index' || $urlParts[0] == '' ) ? $page['name']='accueil' : $page['name']=$urlParts[0];
+    if(isset($urlParts[0])) {
+        //Récupération du nom de la page
+        ($urlParts[0] == 'index' || $urlParts[0] == '') ? $page['name'] = 'accueil' : $page['name'] = $urlParts[0];
         //array_shift($urlParts);
         unset($urlParts[0]);
+    }else{
+        $page['name'] = 'accueil';
+    }
 
 	if($page['name'] == 'control'){
 	    $page['control'] = true;
diff --git a/application/class/vue.class.php b/application/class/Vue.php
similarity index 95%
rename from application/class/vue.class.php
rename to application/class/Vue.php
index 5aa3174..c0a09a0 100644
--- a/application/class/vue.class.php
+++ b/application/class/Vue.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MVC\Classe;
+
 define( "LAYOUT_PATH" , APPLICATION_PATH . DIRECTORY_SEPARATOR . "layout");
 
 
diff --git a/application/include/vues/accueil.phtml b/application/include/vues/accueil.phtml
index 86855de..e62bf6f 100644
--- a/application/include/vues/accueil.phtml
+++ b/application/include/vues/accueil.phtml
@@ -1,7 +1,2 @@
-<h1>Page de gestion des adresses IP</h1>
-<br /><br /><br />
-<h2>Possibilités d'afficher toutes les adresses par VLAN et Zone d'adresse</h2>
-<h2>Ainsi que de faire des recherches par nom de machine, profil et adresse ip</h2>
-<h2>Possibilité d'ajouter/supprimer des VLAN dans la base de données</h2>
-<h2>Possibilité de supprimer les adresses ip qui ne sont pas modifiées par Abitop</h2>
-<h3>Historisation des ajouts et des suppressions</h3>
\ No newline at end of file
+<h1>Accueil</h1>
+<br /><br />
\ No newline at end of file
diff --git a/application/layout/include/standard/header.phtml b/application/layout/include/standard/header.phtml
index 9a17ce1..b300a45 100644
--- a/application/layout/include/standard/header.phtml
+++ b/application/layout/include/standard/header.phtml
@@ -1,7 +1,7 @@
 <div>
     <h2>Menu Experiments</h2>
     <ul>
-        <li><a href="<?php echo PATH_URL; ?>acceuil">Acceuil</a></li>
+        <li><a href="<?php echo PATH_URL; ?>accueil">Accueil</a></li>
         <li><a href="<?php echo PATH_URL; ?>error">Error</a></li>
     </ul>
 </div>
diff --git a/application/parameters.php b/application/parameters.php
index 74c2d70..ac5ebdf 100644
--- a/application/parameters.php
+++ b/application/parameters.php
@@ -8,4 +8,4 @@ define('DSN_BDD2',"mysql:host=localhost;dbname=db2");
 define('USER_BDD2',"user2");
 define('PASS_BDD2',"pass2");
 
-define('PATH_URL',"http://ssdom.domain.tld/public/");
\ No newline at end of file
+define('PATH_URL',"http://vlan.localhost/");
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..790fe11
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,8 @@
+{
+    "autoload": {
+        "psr-4": {
+            "MVC\\Classe\\":"./application/class",
+            "MVC\\Objets\\":"./application/objets"
+        }
+    }
+}
diff --git a/public/index.php b/public/index.php
index 4896da6..635a298 100644
--- a/public/index.php
+++ b/public/index.php
@@ -4,10 +4,10 @@ error_reporting(-1);
 ini_set('display_errors', 1);
 
 define("APPLICATION_PATH", dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR."application");
-define("CLASSES_PATH", APPLICATION_PATH.DIRECTORY_SEPARATOR."class");
+define("VENDOR_PATH", dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR."vendor");
 
+//require APPLICATION_PATH.DIRECTORY_SEPARATOR."autoloader.php";
+require VENDOR_PATH.DIRECTORY_SEPARATOR."autoload.php";
 
-require CLASSES_PATH.DIRECTORY_SEPARATOR."application.class.php";
-
-$poo_v1 = new Application();
+$poo_v1 = new \MVC\Classe\Application();
 $poo_v1->launch();