summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--src/controller/ViewController.php2
-rw-r--r--src/installation.php4
-rw-r--r--src/router.php2
4 files changed, 7 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index 3ebe29c..df3afa2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "nageurs/bigoudens", 2 "name": "CMS",
3 "description": "site web du club de natation: les nageurs bigoudens à Pont-l'Abbé", 3 "description": "CMS maison avec PHP, doctrine et tinMCE",
4 "require": { 4 "require": {
5 "doctrine/dbal": "^4.2", 5 "doctrine/dbal": "^4.2",
6 "doctrine/orm": "^3.3", 6 "doctrine/orm": "^3.3",
@@ -28,7 +28,7 @@
28 "email": "paul.jusot@fdn.fr" 28 "email": "paul.jusot@fdn.fr"
29 } 29 }
30 ], 30 ],
31 "autoload": { 31 "autoload": {
32 "classmap": ["src/"] 32 "classmap": ["src/"]
33 } 33 }
34} 34}
diff --git a/src/controller/ViewController.php b/src/controller/ViewController.php
index 69955c6..0830a5b 100644
--- a/src/controller/ViewController.php
+++ b/src/controller/ViewController.php
@@ -16,7 +16,7 @@ class ViewController extends AbstractBuilder
16 16
17 public function __construct(){} 17 public function __construct(){}
18 18
19 public function buildView(Request $request, EntityManager $entityManager): Response 19 public function buildView(EntityManager $entityManager, Request $request): Response
20 { 20 {
21 // accès au modèle 21 // accès au modèle
22 $director = new Director($entityManager, true); 22 $director = new Director($entityManager, true);
diff --git a/src/installation.php b/src/installation.php
index eaf2181..5adb697 100644
--- a/src/installation.php
+++ b/src/installation.php
@@ -107,9 +107,9 @@ function makeStartPage(EntityManager $entityManager){
107 $main = new Node('main', NULL, [], 3, NULL, NULL, NULL); 107 $main = new Node('main', NULL, [], 3, NULL, NULL, NULL);
108 $footer = new Node('footer', NULL, [], 4, NULL, NULL, NULL); 108 $footer = new Node('footer', NULL, [], 4, NULL, NULL, NULL);
109 $breadcrumb = new Node('breadcrumb', NULL, [], 2, $header, NULL, NULL); 109 $breadcrumb = new Node('breadcrumb', NULL, [], 2, $header, NULL, NULL);
110 $head_login = new Node('head', NULL, ["stop" => true, 'css_array' => ['body', 'head', 'nav'], 'js_array' => ['main']], 1, NULL, $connection, NULL); 110 $head_login = new Node('head', NULL, ["stop" => true, 'css_array' => ['body'], 'js_array' => ['main']], 1, NULL, $connection, NULL);
111 $login = new Node('login', NULL, [], 1, $main, $connection, NULL); 111 $login = new Node('login', NULL, [], 1, $main, $connection, NULL);
112 $head_my_account = new Node('head', NULL, ["stop" => true, 'css_array' => ['body', 'head', 'nav'], 'js_array' => ['main']], 1, NULL, $my_account, NULL); 112 $head_my_account = new Node('head', NULL, ["stop" => true, 'css_array' => ['body'], 'js_array' => ['main']], 1, NULL, $my_account, NULL);
113 $user_edit = new Node('user_edit', NULL, [], 1, $main, $my_account, NULL); 113 $user_edit = new Node('user_edit', NULL, [], 1, $main, $my_account, NULL);
114 $head_edit_menu = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'menu', 'foot'], 'js_array' => ['main', 'menu']], 1, NULL, $menu_paths, NULL); 114 $head_edit_menu = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'menu', 'foot'], 'js_array' => ['main', 'menu']], 1, NULL, $menu_paths, NULL);
115 $bloc_edit_menu = new Node('menu', NULL, [], 1, $main, $menu_paths, NULL); 115 $bloc_edit_menu = new Node('menu', NULL, [], 1, $main, $menu_paths, NULL);
diff --git a/src/router.php b/src/router.php
index 238cac9..eddd199 100644
--- a/src/router.php
+++ b/src/router.php
@@ -40,7 +40,7 @@ if($_SERVER['REQUEST_METHOD'] === 'GET'){
40 } 40 }
41 41
42 // construction d'une page 42 // construction d'une page
43 $response = new ViewController()->buildView($request, $entityManager); 43 $response = (new ViewController)->buildView($entityManager, $request);
44} 44}
45 45
46 46