Merge pull request #82 from philippebeck/dev

Release 4.3.0
philippebeck · Jul 3, 2020 · 8a76757 · 8a76757
2 parents 391df03 + 6c900a5
commit 8a76757
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@ The Controller part inherits the essential methods of the MainController & the F
 
 The sessions are managed by Pam for user connection actions & for user alert actions, all with filters
 
-All superglobals are managed by GlobalsController with filters too.
+All superglobals are managed by the GlobalsController with filters too.
 
-The contact part is managed by MailController with SwiftMailer package.
+The service part is managed by the ServiceController.
 
 ## Summary
 
@@ -99,7 +99,7 @@ Pam has continuous support !
 
 Documentation is available !
 
-[![WebSite Status](https://img.shields.io/website-up-down-green-red/https/github.com/philippebeck/pam/wiki.svg?label=Documentation)](https://github.com/philippebeck/pam/wiki)
+[![WebSite Status](https://img.shields.io/website-up-down-green-red/https/pam.philippebeck.net.svg?label=Documentation)](https://pam.philippebeck.net)
 
 ---
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "philippebeck/pam",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "type": "library",
   "description": "Php Approachable Microframework",
   "keywords": [

diff --git a/composer.lock b/composer.lock
diff --git a/core/Controller/MainController.php b/core/Controller/MainController.php
@@ -36,12 +36,8 @@ public function __construct()
         parent::__construct();
 
         $this->service  = new ServiceController();
-        $this->twig     = new Environment(new FilesystemLoader("../src/View"), array(
-            "cache" => false,
-            "debug" => true
-        ));
+        $this->twig     = new Environment(new FilesystemLoader(TWIG_TEMPLATES), array("cache" => TWIG_CACHE));
 
-        $this->twig->addExtension(new DebugExtension());
         $this->twig->addExtension(new MainExtension());
         $this->twig->addExtension(new GlobalsExtension());
         $this->twig->addExtension(new ServiceExtension());