Benzine/Core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support overriding the charset and driver

Browse source
This commit is contained in:
Greyscale 2020-02-24 17:53:34 +01:00
parent 6cd0599e31
commit 19f9f2726d
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/⌬.php
View file

@ -126,15 +126,17 @@ class ⌬
$this->setupMiddlewares();
$this->addViewPath($this->getContainer()->get(Controllers\Controller::class)->getViewsPath());
if (file_exists($this->configuration->get(Configuration::KEY_APP_ROOT).'/views/')) {
$this->addViewPath($this->configuration->get(Configuration::KEY_APP_ROOT).'/views/');
}
if (file_exists($this->configuration->get(Configuration::KEY_APP_ROOT).'/src/Views')) {
$this->addViewPath($this->configuration->get(Configuration::KEY_APP_ROOT).'/src/Views');
}
if(class_exists(Controllers\Controller::class)) {
$this->addViewPath($this->getContainer()->get(Controllers\Controller::class)->getViewsPath());
if (file_exists($this->configuration->get(Configuration::KEY_APP_ROOT) . '/views/')) {
$this->addViewPath($this->configuration->get(Configuration::KEY_APP_ROOT) . '/views/');
}
if (file_exists($this->configuration->get(Configuration::KEY_APP_ROOT) . '/src/Views')) {
$this->addViewPath($this->configuration->get(Configuration::KEY_APP_ROOT) . '/src/Views');
}
$this->interrogateControllers();
$this->interrogateControllers();
}
}
public function getConfiguration(): Configuration
@ -213,13 +215,13 @@ class ⌬
$dbConfig = new DatabaseConfig();
foreach ($configuration->getArray('benzine/databases') as $dbName => $database) {
$dbConfig->set($dbName, [
'driver' => 'Pdo_Mysql',
'driver' => $database['driver'] ?? 'Pdo_Mysql',
'hostname' => gethostbyname($database['host']),
'port' => $database['port'] ?? 3306,
'username' => $database['username'],
'password' => $database['password'],
'database' => $database['database'],
'charset' => 'UTF8',
'charset' => $database['charset'] ?? 'UTF8',
]);
}