avior/DeltaCMS
1
0
Fork 0
mirror of https://github.com/Aviortheking/DeltaCMS.git synced 2025-04-23 19:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed root variable and made it public

Browse Source
This commit is contained in:
Florian Bouillon 2019-05-07 14:29:47 +02:00
parent 12b6bf71cc
commit 0d36c51ad2
No known key found for this signature in database
GPG Key ID: B143FF27EF555D16
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/DeltaCMS/DeltaCMS.php
View File

@ -30,21 +30,23 @@ class DeltaCMS
if (!isset(self::$instance)) { if (!isset(self::$instance)) {
define("ROOT", dirname(dirname(__DIR__))); define("ROOT", dirname(dirname(__DIR__)));
$ap = self::$instance = new self(); $ap = self::$instance = new self();
$ap->root = dirname(__DIR__); $ap->root = dirname(dirname(__DIR__));
$ap->settings = jsonc_decode(dirname($ap->root) . "/config.jsonc", false);
$ap->settings->cache->path = dirname($ap->root) . DIRECTORY_SEPARATOR . $ap->settings->cache->path;
$ap->loader = new FilesystemLoader(); $ap->loader = new FilesystemLoader();
$ap->addLoaderFolder($ap->root . "/DeltaCMS/Twig"); $ap->addLoaderFolder($ap->root . "/src/DeltaCMS/Twig");
// $ap->setLoader(new FilesystemLoader()); // $ap->setLoader(new FilesystemLoader());
} }
return self::$instance; return self::$instance;
} }
public function getRoot(): string
{
return $this->root;
}
/** @var Logger $logger */ /** @var Logger $logger */
private $logger; private $logger;
public function getLogger(): Logger public function getLogger(): Logger
{ {
return isset($this->logger) ? $this->logger : $this->logger = new Logger(dirname($this->root)); return isset($this->logger) ? $this->logger : $this->logger = new Logger($this->root . "/logs/logs.log");
} }
/** @var \Twig\Loader\FilesystemLoader $loader */ /** @var \Twig\Loader\FilesystemLoader $loader */
@ -76,7 +78,7 @@ class DeltaCMS
if (!$this->cache) { if (!$this->cache) {
$driver = $this->settings->cache->driver; $driver = $this->settings->cache->driver;
$options = $this->settings->cache->options; $options = $this->settings->cache->options;
$options->path = dirname($this->root) . $this->settings->cache->path; $options->path = $this->root . $this->settings->cache->path;
$this->cache = new $driver($this->settings->cache->options); $this->cache = new $driver($this->settings->cache->options);
} }
// dd($this->cache); // dd($this->cache);
@ -95,7 +97,7 @@ class DeltaCMS
{ {
if (!isset($this->em)) { if (!isset($this->em)) {
$config = Setup::createAnnotationMetadataConfiguration(array( $config = Setup::createAnnotationMetadataConfiguration(array(
dirname($this->root) . "/modules/Aptatio/DB" $this->root . "/modules/Aptatio/DB"
), true); ), true);
$db = $this->settings->database; $db = $this->settings->database;