General improvements

src/App.php

@@ -9,41 +9,52 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 2.5.0
+ * @since 2.6.0
  */
 
 namespace Quantum;
 
 use Quantum\Tracer\ErrorHandler;
-use Quantum\Debugger\Debugger;
 use Quantum\Di\Di;
 
+if (!defined('DS')) define('DS', DIRECTORY_SEPARATOR);
+
 /**
  * Class App
  * @package Quantum
  */
 class App
 {
 
+    /**
+     * @var string
+     */
+    public static $baseDir = __DIR__;
+
     /**
      * Starts the app
+     * @param string $baseDir
+     * @throws \ErrorException
+     * @throws \Quantum\Exceptions\ConfigException
      * @throws \Quantum\Exceptions\ControllerException
      * @throws \Quantum\Exceptions\CsrfException
+     * @throws \Quantum\Exceptions\DatabaseException
      * @throws \Quantum\Exceptions\DiException
      * @throws \Quantum\Exceptions\EnvException
      * @throws \Quantum\Exceptions\HookException
      * @throws \Quantum\Exceptions\LangException
-     * @throws \Quantum\Exceptions\LoaderException
      * @throws \Quantum\Exceptions\MiddlewareException
      * @throws \Quantum\Exceptions\ModuleLoaderException
      * @throws \Quantum\Exceptions\RouteException
+     * @throws \Quantum\Exceptions\SessionException
      * @throws \Quantum\Exceptions\ViewException
      * @throws \ReflectionException
-     * @throws \ErrorException
      */
-    public static function start()
+    public static function start(string $baseDir)
     {
-        self::loadCoreFunctions();
+        self::loadCoreFunctions($baseDir . DS . 'vendor' . DS . 'quantum' . DS . 'framework' . DS . 'src' . DS . 'Helpers');
+
+        self::setBaseDir($baseDir);
 
         Di::loadDefinitions();
 
@@ -52,11 +63,34 @@ public static function start()
         Bootstrap::run();
     }
 
-    public static function loadCoreFunctions()
+    /**
+     * Loads the core functions
+     * @param string $path
+     */
+    public static function loadCoreFunctions(string $path)
     {
-        foreach (glob(HELPERS_DIR . DS . 'functions' . DS . '*.php') as $filename) {
+        foreach (glob($path . DS . '*.php') as $filename) {
             require_once $filename;
         }
     }
 
-}
+    /**
+     * Sets the app base directory
+     * @param string $baseDir
+     */
+    public static function setBaseDir(string $baseDir)
+    {
+        self::$baseDir = $baseDir;
+    }
+
+    /**
+     * Gets the app base directory
+     * @return string
+     */
+    public static function getBaseDir(): string
+    {
+        return self::$baseDir;
+    }
+
+}
+

src/Bootstrap.php

@@ -9,12 +9,13 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 2.5.0
+ * @since 2.6.0
  */
 
 namespace Quantum;
 
 use Quantum\Exceptions\StopExecutionException;
+use Quantum\Libraries\Database\Database;
 use Quantum\Libraries\Storage\FileSystem;
 use Quantum\Environment\Environment;
 use Quantum\Libraries\Config\Config;
@@ -27,6 +28,7 @@
 use Quantum\Loader\Loader;
 use Quantum\Http\Response;
 use Quantum\Http\Request;
+use Quantum\Loader\Setup;
 use Quantum\Di\Di;
 
 /**
@@ -37,17 +39,18 @@ class Bootstrap
 {
 
     /**
+     * Boots the app
+     * @throws \Quantum\Exceptions\ConfigException
      * @throws \Quantum\Exceptions\ControllerException
      * @throws \Quantum\Exceptions\CsrfException
+     * @throws \Quantum\Exceptions\DatabaseException
      * @throws \Quantum\Exceptions\DiException
      * @throws \Quantum\Exceptions\EnvException
-     * @throws \Quantum\Exceptions\HookException
      * @throws \Quantum\Exceptions\LangException
-     * @throws \Quantum\Exceptions\LoaderException
      * @throws \Quantum\Exceptions\MiddlewareException
-     * @throws \Quantum\Exceptions\ModelException
      * @throws \Quantum\Exceptions\ModuleLoaderException
      * @throws \Quantum\Exceptions\RouteException
+     * @throws \Quantum\Exceptions\SessionException
      * @throws \ReflectionException
      */
     public static function run()
@@ -60,8 +63,9 @@ public static function run()
 
             Debugger::initStore();
 
-            Environment::getInstance()->load($loader);
-            Config::getInstance()->load($loader);
+            Environment::getInstance()->load(new Setup('config', 'env'));
+
+            Config::getInstance()->load(new Setup('config', 'config'));
 
             $request = Di::get(Request::class);
             $response = Di::get(Response::class);
@@ -78,9 +82,11 @@ public static function run()
             $loader->loadDir(base_dir() . DS . 'helpers');
             $loader->loadDir(base_dir() . DS . 'libraries');
 
-            Lang::getInstance()
-                ->setLang($request->getSegment(config()->get('lang_segment')))
-                ->load($loader, $fs);
+            if (config()->has('langs')) {
+                Lang::getInstance()
+                    ->setLang($request->getSegment(config()->get('lang_segment')))
+                    ->load();
+            }
 
             MvcManager::handle($request, $response);
 

src/Console/CommandInterface.php

@@ -9,7 +9,7 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 1.7.0
+ * @since 2.6.0
  */
 
 namespace Quantum\Console;
@@ -22,7 +22,6 @@ interface CommandInterface
 {
     /**
      * Executes the current command.
-     * @return mixed
      */
     public function exec();
 

src/Console/Commands/DebugBarAssetsCommand.php

@@ -56,7 +56,6 @@ class DebugBarAssetsCommand extends QtCommand
 
     /**
      * Executes the command and publishes the debug bar assets
-     * @return mixed|void
      */
     public function exec()
     {
@@ -71,7 +70,7 @@ public function exec()
      * @param string $dst
      * @throws \RuntimeException
      */
-    private function recursive_copy($src, $dst)
+    private function recursive_copy(string $src, string $dst)
     {
         $dir = opendir($src);
 

src/Console/Commands/EnvCommand.php

@@ -43,7 +43,6 @@ class EnvCommand extends QtCommand
 
     /**
      * Executes the command and creates new .env file
-     * @return mixed|void
      */
     public function exec()
     {

src/Console/Commands/KeyGenerateCommand.php

@@ -9,15 +9,14 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 2.0.0
+ * @since 2.6.0
  */
 
 namespace Quantum\Console\Commands;
 
 use Quantum\Environment\Environment;
 use Quantum\Console\QtCommand;
-use Quantum\Loader\Loader;
-use Quantum\Di\Di;
+use Quantum\Loader\Setup;
 
 /**
  * Class KeyGenerateCommand
@@ -54,17 +53,17 @@ class KeyGenerateCommand extends QtCommand
 
     /**
      * Executes the command and stores the generated key to .env file
-     * @return mixed|void
+     * @throws \Quantum\Exceptions\DiException
+     * @throws \Quantum\Exceptions\EnvException
+     * @throws \ReflectionException
      * @throws \Exception
      */
     public function exec()
     {
         $key = $this->generateRandomKey();
 
-        $loader = Di::get(Loader::class);
-
         if ($key) {
-            Environment::getInstance()->load($loader)->updateRow('APP_KEY', $key);
+            Environment::getInstance()->load(new Setup('config', 'env'))->updateRow('APP_KEY', $key);
         }
 
         $this->info('Application key successfully generated and stored.');
@@ -75,7 +74,7 @@ public function exec()
      * @return string
      * @throws \Exception
      */
-    private function generateRandomKey()
+    private function generateRandomKey(): string
     {
         return base64_encode(random_bytes((int) $this->getOption('length')));
     }

src/Console/Commands/WelcomeCommand.php → src/Console/Commands/VersionCommand.php

@@ -9,51 +9,50 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 2.0.0
+ * @since 2.6.0
  */
 
 namespace Quantum\Console\Commands;
 
 use Quantum\Environment\Environment;
 use Quantum\Console\QtCommand;
-use Quantum\Loader\Loader;
+use Quantum\Loader\Setup;
 use Figlet\Figlet;
-use Quantum\Di\Di;
 
 /**
- * Class WelcomeCommand
+ * Class VersionCommand
  * @package Quantum\Console\Commands
  */
-class WelcomeCommand extends QtCommand
+class VersionCommand extends QtCommand
 {
 
     /**
      * Command name
      * @var string
      */
-    protected $name = 'core:welcome';
+    protected $name = 'core:version';
 
     /**
      * Command description
      * @var string
      */
-    protected $description = 'Installation greetings';
+    protected $description = 'Core version';
 
     /**
      * Command help text
      * @var string
      */
-    protected $help = 'Printing greetings into the terminal';
+    protected $help = 'Printing the current version of the framework into the terminal';
 
     /**
      * Executes the command and prints greetings into the terminal
-     * @return void
+     * @throws \Quantum\Exceptions\DiException
+     * @throws \Quantum\Exceptions\EnvException
+     * @throws \ReflectionException
      */
     public function exec()
     {
-        $loader = Di::get(Loader::class);
-
-        Environment::getInstance()->load($loader);
+        Environment::getInstance()->load(new Setup('config', 'env'));
 
         $figlet = new Figlet();