code optimize

Author: mdabbas-cse

framework/Application.php

@@ -33,6 +33,13 @@ final class Application
    */
   protected $config = [];
 
+  /**
+   * All application config
+   * 
+   * @var array
+   */
+  protected $allConfig = [];
+
   /**
    * Application instance
    * 
@@ -63,10 +70,16 @@ final class Application
    */
   public function __construct()
   {
-    // $this->config = Configuration::get('app');
     self::$instance = $this;
     $this->request = new Request();
     $this->response = new Response();
+    $this->loadDotEnv();
+    $this->allConfig = Configuration::all();
+    $this->loadAppConfig();
+    $this->loadHelpers();
+    $this->setDefaultTimezone();
+    $this->registerErrorHandler();
+    $this->registerShutdownHandler();
   }
 
   /**
@@ -94,12 +107,6 @@ protected function setDefaultTimezone()
    */
   public function run()
   {
-    $this->loadHelpers();
-    $this->loadDotEnv();
-    $this->loadAppConfig();
-    $this->setDefaultTimezone();
-    $this->registerErrorHandler();
-    $this->registerShutdownHandler();
     $this->registerRoutes();
     $this->registerApiRoutes();
     $this->registerMiddlewares();
@@ -113,7 +120,7 @@ public function run()
    */
   protected function loadAppConfig()
   {
-    $this->config = Configuration::get('app');
+    $this->config = $this->allConfig['app'];
   }
 
   /**
@@ -236,7 +243,7 @@ public function shutdownHandler()
   /**
    * Load helper functions
    */
-  public static function loadHelpers()
+  public function loadHelpers()
   {
     require_once(ROOT . DS . 'framework' . DS . 'Helpers.php');
   }
@@ -254,12 +261,6 @@ public function loadDotEnv()
    */
   public function runConsoleCommand($argv)
   {
-    $this->loadHelpers();
-    $this->loadDotEnv();
-    $this->loadAppConfig();
-    $this->setDefaultTimezone();
-    $this->registerErrorHandler();
-    $this->registerShutdownHandler();
     Command::run($argv);
   }
 }

framework/Configuration.php

@@ -17,31 +17,24 @@ class Configuration
    */
   public static function get($key = null)
   {
-    $config = self::register($key);
-    if ($config) {
-      return $config;
+    $all = self::all();
+    if (array_key_exists($key, $all)) {
+      return $all[$key];
     }
-    die("Config key \"{$key}\" not found");
+    throw new Exception("Config key \"{$key}\" not found");
   }
 
   /**
-   * register all config files
+   * get all configs
    */
-  public static function register($key)
+  public static function all()
   {
-    $fileArray = scandir(base_path('config'));
-    $fileArray = array_diff($fileArray, ['.', '..']);
-
-    $configFileArray = [];
-
-    foreach ($fileArray as $configFile) {
-      $getFileName = explode('.', $configFile);
-      // if ($getFileName[0] == 'Config') {
-      //   continue;
-      // }
-      $configFileArray[$getFileName[0]] = include_file("config/{$configFile}");
+    $path = ROOT . DS . 'config' . DS . 'Config.php';
+    if (!file_exists($path)) {
+      throw new Exception("Config file not found");
     }
-    return $configFileArray[$key];
+    return include(ROOT . DS . 'config' . DS . 'Config.php');
   }
 
+
 }