dev 2020-10

src/App.php

@@ -3,7 +3,7 @@
 namespace KarmaFW;
 
 use \KarmaFW\Lib\Hooks\HooksManager;
-use \KarmaFW\Database\Sql\SqlDb;
+//use \KarmaFW\Database\Sql\SqlDb;
 //use \KarmaFW\Database\Sql\SqlOrmModel;
 
 class App
@@ -77,16 +77,16 @@ class App
 
 		// define class aliases
 		class_alias('\\KarmaFW\\App', 'App');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlDb', 'SqlDb');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlSchema', 'SqlSchema');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlTable', 'SqlTable');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlOrmModel', 'SqlOrmModel');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlQuery', 'SqlQuery');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlWhere', 'SqlWhere');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlExpr', 'SqlExpr');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlLike', 'SqlLike');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlIn', 'SqlIn');
-		class_alias('\\KarmaFW\\Database\\Sql\\SqlTools', 'SqlTools');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlDb', 'SqlDb');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlSchema', 'SqlSchema');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlTable', 'SqlTable');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlOrmModel', 'SqlOrmModel');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlQuery', 'SqlQuery');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlWhere', 'SqlWhere');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlExpr', 'SqlExpr');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlLike', 'SqlLike');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlIn', 'SqlIn');
+		//class_alias('\\KarmaFW\\Database\\Sql\\SqlTools', 'SqlTools');
 		
 
 		if (defined('DB_DSN')) {
@@ -200,7 +200,11 @@ class App
 			if (empty($dsn) && defined('DB_DSN')) {
 				$dsn = DB_DSN;
 			}
-			$instances[$instance_name] = new SqlDb($dsn);
+
+			//$instances[$instance_name] = new SqlDb($dsn);
+
+			$db = App::getData('app')->get('db');
+			$instances[$instance_name] = $db($dsn);
 		}
 
 		return $instances[$instance_name];

src/Http/Response.php

@@ -262,7 +262,7 @@ class Response
 
 		if ($this->status === 200 && empty($this->body)) {
 			// No content
-			$this->setStatus(204);
+			//$this->setStatus(204);
 		}
 
 		if (! empty($this->status)) {

src/Kernel.php

@@ -106,11 +106,11 @@ class Kernel
 
 		if (defined('DB_DSN')) {
 			//$this->db = static::getDb('default', DB_DSN);
-			$this->db = $this->connectDb('default', DB_DSN); // TODO: a deplacer dans $services['db'] ( ou $services['sql'] ? )
+			//$this->db = $this->connectDb('default', DB_DSN); // TODO: a deplacer dans $services['db'] ( ou $services['sql'] ? )
 		}
 
 		if (defined('REDIS_DSN')) {
-			$this->redis = new Redis(REDIS_DSN); // TODO: a deplacer dans $services['redis']
+			//$this->redis = new Redis(REDIS_DSN); // TODO: a deplacer dans $services['redis']
 		}
 		
 	}
@@ -177,6 +177,13 @@ class Kernel
 	}
 
     
+    /*
+	public function setService($service_name, $callback)
+	{
+		return $this->set($service_name, $callback);
+	}
+	*/
+
 	public function loadServices()
 	{
 		// TODO: rendre parametrable la liste des services
@@ -186,10 +193,16 @@ class Kernel
 		});
 
 		$this->set('db', function ($dsn=null) {
+			if (empty($dsn) && defined('DB_DSN')) {
+				$dsn = DB_DSN;
+			}
 			return new \KarmaFW\Database\Sql\SqlDb($dsn);
 		});
 
 		$this->set('redis', function ($dsn=null) {
+			if (empty($dsn) && defined('REDIS_DSN')) {
+				$dsn = REDIS_DSN;
+			}
 			return new \KarmaFW\Database\Redis\Redis($dsn);
 		});
 

src/Templates/LightweightTemplate.php

@@ -9,8 +9,8 @@ class LightweightTemplate {
 	// https://codeshack.io/lightweight-template-engine-php/
 
 	static $blocks = array();
-	static $cache_path = APP_DIR . '/var/cache/templates';
-	static $tpl_path = APP_DIR . '/templates';
+	static $cache_path = TPL_CACHE_DIR; // APP_DIR . '/var/cache/templates';
+	static $tpl_path = TPL_DIR;
 	static $cache_enabled = (ENV == 'prod') || true;
 	static $tpl_last_updated = null;