Skip to content

Fix application configuration initialization #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2022
Merged

Fix application configuration initialization #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions src/Core/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public function __construct($config = [])
self::$app = $this;

$this->user = null;
$this->userClass = $config['userClass'];
$this->request = new Request();
$this->response = new Response();
$this->router = new Router($this->request, $this->response);
Expand All @@ -40,15 +39,8 @@ public function __construct($config = [])
*/
public function LoadSettings($config) {
self::$ROOT_DIR = $config['root'];
$this->config['app'] = $config['app'];
$this->config['auth'] = $config['auth'];
$this->config['environment'] = $config['environment'];
$this->config['connections'] = $config['connections'];

// Load env file
$dotenv = Dotenv::createImmutable(self::$ROOT_DIR);
$env = $dotenv->load();
$this->config['env'] = $this->ToObject($env);
$this->userClass = $config['auth']['userClass'];
$this->config = $config;

// Transform config type (Array) to (Object)
$this->config = $this->ToObject($this->config);
Expand All @@ -70,7 +62,7 @@ public function Run()
echo $this->router->RenderView('layouts/error', [
'message' => $e->getMessage(),
'code' => $errorCode,
'app' => Application::$app->config['app']
'app' => Application::$app->config->app
]);
}
}
Expand All @@ -82,7 +74,7 @@ public function Debug($var) {
}

public function LogError($code, $message) {
$db = new Database(Application::$app->config['env']->APP_ENV == 'local' ? 'ils-local' : 'ils-live');
$db = new Database('ils');
$db->InsertOne("exception_logs", ['code', 'message'], [':in_code' => $code, ':in_message' => $message]);
}

Expand Down
13 changes: 13 additions & 0 deletions src/Core/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,19 @@ public function GetBody()
return $data;
}

public function GetValue($key = NULL) {
if(is_null($key)) {
return FALSE;
}
$data = $this->GetBody();
if(array_key_exists($key, $data)) {
if(empty($data[$key])) {
return FALSE;
}
return $data[$key];
}
}

/**
* @param $params
* @return self
Expand Down