From 21073bb54e53ee5760997f0a87b1f387e17b0f2d Mon Sep 17 00:00:00 2001
From: Emmanuel ROY <emmanuel.roy@infoartsmedia.fr>
Date: Thu, 5 Dec 2019 18:34:13 +0100
Subject: [PATCH] quelques modifications pour les test du Conduit

---
 .idea/.gitignore                              |  3 ---
 .idea/MVC---Objet.iml                         | 22 -------------------
 .idea/misc.xml                                |  6 -----
 .idea/modules.xml                             |  8 -------
 .idea/php.xml                                 | 19 ----------------
 .idea/vcs.xml                                 |  6 -----
 application/class/Application.php             |  1 -
 application/class/Controlleur.php             |  2 +-
 application/class/Dispacher.php               |  1 -
 application/class/Implement/Conduit.php       |  2 +-
 .../include/vues/view/accueil.blade.php       |  1 +
 application/include/vues/view/foo.blade.php   | 18 +++++++--------
 12 files changed, 12 insertions(+), 77 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/MVC---Objet.iml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/php.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 0e40fe8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Default ignored files
-/workspace.xml
\ No newline at end of file
diff --git a/.idea/MVC---Objet.iml b/.idea/MVC---Objet.iml
deleted file mode 100644
index 143bc94..0000000
--- a/.idea/MVC---Objet.iml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/../MVC-Modular-WindWalkerapplication/objets" isTestSource="false" packagePrefix="MVC\Objets\" />
-      <sourceFolder url="file://$MODULE_DIR$/../MVC-Modular-WindWalkerapplication/class" isTestSource="false" packagePrefix="MVC\Classe\" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hybridauth/hybridauth" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/container" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/events" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/filesystem" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/support" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/view" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/neitanod/forceutf8" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/finder" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/windwalker/renderer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/windwalker/structure" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 28a804d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 3be15e6..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/MVC---Objet.iml" filepath="$PROJECT_DIR$/.idea/MVC---Objet.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
deleted file mode 100644
index 026b825..0000000
--- a/.idea/php.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpIncludePathManager">
-    <include_path>
-      <path value="$PROJECT_DIR$/vendor/windwalker/renderer" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/view" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/support" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/filesystem" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/events" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/container" />
-      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/vendor/windwalker/structure" />
-      <path value="$PROJECT_DIR$/vendor/hybridauth/hybridauth" />
-      <path value="$PROJECT_DIR$/vendor/neitanod/forceutf8" />
-    </include_path>
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/application/class/Application.php b/application/class/Application.php
index 5b69385..c65a56c 100755
--- a/application/class/Application.php
+++ b/application/class/Application.php
@@ -19,7 +19,6 @@ class Application
 
         $dispacher = new Dispacher();
         $this->route = $dispacher->route;
-        //$this->route = NULL;
     }
 
     public function launch(){
diff --git a/application/class/Controlleur.php b/application/class/Controlleur.php
index 590a287..4f5b471 100755
--- a/application/class/Controlleur.php
+++ b/application/class/Controlleur.php
@@ -28,7 +28,7 @@ class Controlleur{
                     $conduitRoute = "\\" . $conduit[0];
                     $method = strtolower($conduit[1]);
                     $class = new $conduitRoute();
-                    $class = $class->initialize($application->route);
+                    $class->initialize($application->route);
                     $this->vue = new VueVide();
                     $this->vue->ecran = $class->$method();
 
diff --git a/application/class/Dispacher.php b/application/class/Dispacher.php
index 4e5753e..8ac87d1 100755
--- a/application/class/Dispacher.php
+++ b/application/class/Dispacher.php
@@ -18,7 +18,6 @@ class Dispacher
     public function __construct()
     {
 
-        //echo $_SERVER['REQUEST_URI'];
         //Avoid callback from empty homepage
         if ($_SERVER['REQUEST_URI'] == '/' || $_SERVER['REQUEST_URI'] == '') {
             $this->route = NULL;
diff --git a/application/class/Implement/Conduit.php b/application/class/Implement/Conduit.php
index 10876ce..cc63e1f 100755
--- a/application/class/Implement/Conduit.php
+++ b/application/class/Implement/Conduit.php
@@ -17,6 +17,6 @@ class Conduit extends Action
                 }
             }
         }
-        return $this;
+        return;
     }
 }
\ No newline at end of file
diff --git a/application/include/vues/view/accueil.blade.php b/application/include/vues/view/accueil.blade.php
index d1ef3e7..6786abd 100755
--- a/application/include/vues/view/accueil.blade.php
+++ b/application/include/vues/view/accueil.blade.php
@@ -16,6 +16,7 @@
     {{\MVC\Classe\ControlleurAction::inserer('default',[])}}
     {{\MVC\Classe\ControlleurAction::inserer('default.default',[4,5,6])}}
     {{\MVC\Classe\ControlleurAction::inserer('default.variableSlug',['var1','var2','var3'])}}
+
     {{--\MVC\Classe\ControlleurAction::inserer('default.makeHttp11',[])--}}
 
 @endsection
diff --git a/application/include/vues/view/foo.blade.php b/application/include/vues/view/foo.blade.php
index 1a811ef..a8e4457 100755
--- a/application/include/vues/view/foo.blade.php
+++ b/application/include/vues/view/foo.blade.php
@@ -1,16 +1,16 @@
-<html>
-<head>
-    <title>App Name</title>
-</head>
-<body>
+@extends('body')
 
-<div class="container">
+@section('sidebar')
+    @parent
+
+    <p>This is appended to the master sidebar.</p>
+@endsection
+
+@section('content')
     Foo Controlleur
     @if (isset($id))
         {{$id}}
     @else
         id not exist
     @endif
-</div>
-</body>
-</html>
\ No newline at end of file
+@endsection
\ No newline at end of file