Merge pull request #85 from philippebeck/dev

Release 4.5.0
philippebeck · Jul 8, 2020 · eaff5b1 · eaff5b1
2 parents 02cc6ea + 2a1ebce
commit eaff5b1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "philippebeck/pam",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "type": "library",
   "description": "Php Adaptive Microframework",
   "keywords": [

diff --git a/core/Controller/MainController.php b/core/Controller/MainController.php
@@ -9,20 +9,14 @@
 use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
-use Twig\Extension\DebugExtension;
 use Twig\Loader\FilesystemLoader;
 
 /**
  * Class MainController
  * @package Pam\Controller
  */
-abstract class MainController extends GlobalsController
+abstract class MainController extends ServiceController
 {
-    /**
-     * @var ServiceController|null
-     */
-    protected $service = null;
-
     /**
      * @var Environment|null
      */
@@ -35,8 +29,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->service  = new ServiceController();
-        $this->twig     = new Environment(new FilesystemLoader(VIEW_PATH), array("cache" => VIEW_CACHE));
+        $this->twig = new Environment(new FilesystemLoader(VIEW_PATH), array("cache" => VIEW_CACHE));
 
         $this->twig->addExtension(new MainExtension());
         $this->twig->addExtension(new GlobalsExtension());

diff --git a/core/Controller/ServiceController.php b/core/Controller/ServiceController.php
@@ -13,7 +13,7 @@
  * Class ServiceController
  * @package Pam\Controller
  */
-class ServiceController
+abstract class ServiceController extends GlobalsController
 {
     /**
      * @var ArrayManager
@@ -50,6 +50,8 @@ class ServiceController
      */
     public function __construct()
     {
+        parent::__construct();
+
         $this->array    = new ArrayManager();
         $this->curl     = new CurlManager();
         $this->image    = new ImageManager();

diff --git a/core/Model/Factory/PdoFactory.php b/core/Model/Factory/PdoFactory.php
@@ -21,7 +21,12 @@ class PdoFactory
     public static function getPDO()
     {
         if (self::$pdo === null) {
-            self::$pdo = new PDO(DB_DSN, DB_USER, DB_PASS, DB_OPTIONS);
+            self::$pdo = new PDO(
+                "mysql:host=" . DB_HOST . ";dbname=" . DB_NAME,
+                DB_USER,
+                DB_PASS,
+                DB_OPTIONS
+            );
             self::$pdo->exec("SET NAMES UTF8");
         }