rewrite config files to JSON, refactor environment bootstrap #14

YGGverse · Sep 24, 2023 · 32c1bbe · 32c1bbe
1 parent e1054cd
commit 32c1bbe
Show file tree

Hide file tree

Showing 13 changed files with 127 additions and 300 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,12 @@
 
 /src/config/*
 !/src/config/bootstrap.php
+!/src/config/website.json
+!/src/config/sphinx.json
+!/src/config/memcached.json
+!/src/config/database.json
 !/src/config/validator.json
+!/src/config/moderators.json
 !/src/config/nodes.json
 !/src/config/trackers.json
 !/src/config/peers.json

diff --git a/README.md b/README.md
@@ -50,8 +50,9 @@ memcached
 * The web root dir is `/src/public`
 * Deploy the database using [MySQL Workbench](https://www.mysql.com/products/workbench) project presented in the `/database` folder
 * Install [Sphinx Search Server](https://sphinxsearch.com)
-* Configuration examples presented at `/example/environment` folder. On first app launch, configuration file will be auto-generated in `/src/config`
-* Make sure `/src/api` folder writable
+* Server environment examples presented at `/example/environment` folder
+* App config available at `/src/config` folder in JSON format.
+  + To make environment-based configuration for JSON files, create subfolder `/src/config/env` and define `env` in `/src/config/.env` file
 
 #### Contribute
 

diff --git a/example/environment/env.example.php b/example/environment/env.example.php
diff --git a/src/app/controller/index.php b/src/app/controller/index.php
@@ -85,15 +85,15 @@ public function render()
           'type' => 'text/css',
           'href' => sprintf(
             'assets/theme/default/css/common.css?%s',
-            WEBSITE_CSS_VERSION
+            CSS_VERSION
           ),
         ],
         [
           'rel'  => 'stylesheet',
           'type' => 'text/css',
           'href' => sprintf(
             'assets/theme/default/css/framework.css?%s',
-            WEBSITE_CSS_VERSION
+            CSS_VERSION
           ),
         ],
       ]

diff --git a/src/app/controller/response.php b/src/app/controller/response.php
@@ -38,15 +38,15 @@ public function render()
           'type' => 'text/css',
           'href' => sprintf(
             'assets/theme/default/css/common.css?%s',
-            WEBSITE_CSS_VERSION
+            CSS_VERSION
           ),
         ],
         [
           'rel'  => 'stylesheet',
           'type' => 'text/css',
           'href' => sprintf(
             'assets/theme/default/css/framework.css?%s',
-            WEBSITE_CSS_VERSION
+            CSS_VERSION
           ),
         ],
       ]

diff --git a/src/app/controller/welcome.php b/src/app/controller/welcome.php
@@ -92,15 +92,15 @@ public function render()
           'type' => 'text/css',
           'href' => sprintf(
             'assets/theme/default/css/common.css?%s',
-            WEBSITE_CSS_VERSION
+            CSS_VERSION
           ),
         ],
         [
           'rel'  => 'stylesheet',
           'type' => 'text/css',
           'href' => sprintf(
             'assets/theme/default/css/framework.css?%s',
-            WEBSITE_CSS_VERSION
+            CSS_VERSION
           ),
         ],
       ]

diff --git a/src/app/model/database.php b/src/app/model/database.php
@@ -1,17 +1,36 @@
 <?php
 
-class AppModelDatabase {
-
+class AppModelDatabase
+{
   private PDO $_db;
 
   private object $_debug;
 
-  public function __construct(string $host, int $port, string $database, string $username, string $password) {
+  public function __construct(object $config)
+  {
+    $this->_db = new PDO(
+      'mysql:dbname=' . $config->name . ';host=' . $config->host . ';port=' . $config->port . ';charset=utf8',
+      $config->user,
+      $config->password,
+      [
+        PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
+      ]
+    );
+
+    $this->_db->setAttribute(
+      PDO::ATTR_ERRMODE,
+      PDO::ERRMODE_EXCEPTION
+    );
+
+    $this->_db->setAttribute(
+      PDO::ATTR_DEFAULT_FETCH_MODE,
+      PDO::FETCH_OBJ
+    );
 
-    $this->_db = new PDO('mysql:dbname=' . $database . ';host=' . $host . ';port=' . $port . ';charset=utf8', $username, $password, [PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8']);
-    $this->_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    $this->_db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
-    $this->_db->setAttribute(PDO::ATTR_TIMEOUT, 600);
+    $this->_db->setAttribute(
+      PDO::ATTR_TIMEOUT,
+      600
+    );
 
     $this->_debug = (object)
     [
@@ -38,23 +57,23 @@ public function __construct(string $host, int $port, string $database, string $u
   }
 
   // Tools
-  public function beginTransaction() {
-
+  public function beginTransaction() : void
+  {
     $this->_db->beginTransaction();
   }
 
-  public function commit() {
-
+  public function commit() : void
+  {
     $this->_db->commit();
   }
 
-  public function rollBack() {
-
+  public function rollBack() : void
+  {
     $this->_db->rollBack();
   }
 
-  public function getDebug() {
-
+  public function getDebug() : object
+  {
     return $this->_debug;
   }