New update and changes

samples/MyConfiguration.php → app/Controllers/Config/Config.php

@@ -8,8 +8,9 @@
  * @license See LICENSE file
  */
 namespace App\Controllers\Config;
-use Luminova\Config\Configuration;
 
-class MyConfiguration extends Configuration{
+use Luminova\Config\Configuration;
 
+class Config extends Configuration
+{
 }

samples/MyFunctions.php → app/Controllers/Utils/Func.php

@@ -8,8 +8,10 @@
  * @license See LICENSE file
  */
 namespace App\Controllers;
-use Luminova\Functions\Functions;
 
-class MyFunctions extends Functions{
+use \Luminova\Base\BaseFunction;
+
+class Func extends BaseFunction
+{
 
 }

app/Controllers/Utils/Global.php

@@ -0,0 +1,6 @@
+<?php
+/**
+ * This goal file allows you to define your own custom functions
+ * or overwrite core procedural functions to replace them with your own. 
+ * This file is loaded during the bootstrap process and is called during the framework's execution.
+ */

app/Controllers/Welcome.php

@@ -9,15 +9,15 @@
  */
 namespace App\Controllers;
 
-use Luminova\Base\BaseController;
-use Luminova\Config\Configuration;
+use Luminova\Base\BaseViewController;
+use Luminova\Base\BaseConfig;
 
-class Welcome extends BaseController 
+class Welcome extends BaseViewController 
 {
 
     public function page(): void
     {
-        $this->app->render("index")->view();
+        $this->app()->render("index")->view();
     }
 
     public function info(): void
@@ -27,8 +27,8 @@ public function info(): void
             "error" => [
                 "status" => "OK",
                 "code" => 200,
-                "version" => Configuration::version(),
-                "framework" => Configuration::copyright(),
+                "version" => BaseConfig::version(),
+                "framework" => BaseConfig::copyright(),
                 //"details" => "The endpoint [" . $this->getView() . "] you are trying to access does not exist.",
                 "timestamp" => date("Y-m-d H:i:s")
             ]

bootstrap/load.php

@@ -12,7 +12,6 @@
 
 use \App\Controllers\Application;
 
-
 /**
 * Set the custom error handler for non-fatal errors
 */
@@ -24,11 +23,18 @@
 register_shutdown_function(['\Luminova\Errors\Error', 'shutdown']);
 
 /*
-* Load global developer file
+* Require system Common.php
+*/
+if (!defined('APP_COMMON')) {
+    include_once __DIR__ . '/../system/Functions/Common.php';
+}
+
+/*
+* Require application Global.php file if exists.
 */
-$global = __DIR__ . '/../app/Controllers/Global.php';
-if(file_exists($global)){
-    include_once $global;
+$global24 = __DIR__ . '/../app/Controllers/Utils/Global.php';
+if(file_exists($global24)){
+    include_once $global24;
 }
 
 /*

public/index.php

@@ -46,16 +46,9 @@
 * bootstraps the router and set the error handler based on context
 */
 $app->router->bootstraps(
-    new Bootstrap(Bootstrap::WEB, function($router) use ($app) {
-        require __DIR__ . '/../routes/web.php';
-    },
-    $webErrorHandler),
-    new Bootstrap(Bootstrap::API, function($router) use ($app) {
-        require __DIR__ . '/../routes/api.php';
-    }, $apiErrorHandler),
-    new Bootstrap(Bootstrap::CLI, function($router) use ($app){
-        require __DIR__ . '/../routes/cli.php';
-    })
+    new Bootstrap(Bootstrap::WEB, $app, $webErrorHandler),
+    new Bootstrap(Bootstrap::API, $app, $apiErrorHandler),
+    new Bootstrap(Bootstrap::CLI, $app)
 );
 
 /*

samples/.env

@@ -1,7 +1,7 @@
 app.name = Luminova
 app.hostname = luminova.com
 app.base.url = https://luminova.com
-app.base.www.url = https://wwwluminova.com
+app.base.www.url = https://www.luminova.com
 app.timezone = UTC
 ;app.developer = Nanoblock Technology
 # [production and development]

samples/Config.php

@@ -0,0 +1,17 @@
+<?php 
+/**
+ * Luminova Framework
+ *
+ * @package Luminova
+ * @author Ujah Chigozie Peter
+ * @copyright (c) Nanoblock Technology Ltd
+ * @license See LICENSE file
+ */
+namespace App\Controllers\Config;
+
+use \Luminova\Base\BaseConfig;
+
+class Config extends BaseConfig
+{
+
+}

samples/Func.php

@@ -0,0 +1,17 @@
+<?php 
+/**
+ * Luminova Framework
+ *
+ * @package Luminova
+ * @author Ujah Chigozie Peter
+ * @copyright (c) Nanoblock Technology Ltd
+ * @license See LICENSE file
+ */
+namespace App\Controllers;
+
+use \Luminova\Base\BaseFunction;
+
+class Func extends BaseFunction
+{
+
+}

samples/Home.php

@@ -9,16 +9,16 @@
  */
 namespace App\Controllers;
 
-use Luminova\Base\BaseController;
+use \Luminova\Base\BaseViewController;
+
+class Home extends BaseViewController 
+{
+    /** @var \ Luminova\Http\Request $this->request() */
+    /** @var \ Luminova\Application $this->app() */
+    /** @var \Luminova\Security\InputValidator $this->validate() */
 
-class Home extends BaseController {
-    /**
-    * Extending  Luminova\Controller; in your controller
-    * You will have access for request and validation class instance
-    */
-
     public function page(): void
     {
-        $this->app->render("index")->view();
+        $this->app()->render("index")->view();
     }
 }

samples/Session.php

@@ -10,7 +10,8 @@
 
 namespace App\Controllers\Config;
 
-class Session {
+class Session 
+{
     /**
      * The name of the session cookie.
      * @var string $cookieName;

samples/Template.php

@@ -9,7 +9,8 @@
  */
 namespace App\Controllers\Config;
 
-class Template { 
+class Template 
+{ 
     /** 
      * Application template engine
      * 

samples/UserController.php

@@ -8,7 +8,8 @@
  * @license See LICENSE file
  */
 namespace App\Controllers;
-use Luminova\Base\BaseController;
+
+use \Luminova\Base\BaseController;
 use App\Controllers\Models\UserModel;
 
 class UserController extends BaseController
@@ -17,4 +18,9 @@ class UserController extends BaseController
     /** @var \ Luminova\Application $this->app */
     /** @var \Luminova\Security\InputValidator $this->validate */
 
+
+    public function page(): void
+    {
+        $this->app->render("index")->view();
+    }
 }

samples/UserModel.php

@@ -8,7 +8,8 @@
  * @license See LICENSE file
  */
 namespace App\Controllers\Models;
-use Luminova\Base\BaseModel;
+
+use \Luminova\Base\BaseModel;
 
 class UserModel extends BaseModel
 {

system/Application/Application.php

@@ -13,7 +13,7 @@
 use Luminova\Routing\Router;
 use Luminova\Config\DotEnv;
 use Luminova\Template\Template;
-use Luminova\Config\Configuration;
+use Luminova\Base\BaseConfig;
 use App\Controllers\Config\Template as TemplateConfig;
 
 class Application {
@@ -35,7 +35,7 @@ class Application {
      *
      * @var Router
      */
-    public $router;
+    public ?Router $router = null;
 
     /**
      * Initialize the base application constructor
@@ -44,12 +44,12 @@ class Application {
      */
     public function __construct(string $dir = __DIR__) {
         // Register dotenv variables
-        DotEnv::register(Configuration::getRootDirectory($dir) . DIRECTORY_SEPARATOR . '.env');
+        DotEnv::register(BaseConfig::root($dir, '.env'));
 
         /*
         * Register The Application Timezone
         */
-        date_default_timezone_set(Configuration::getVariables("app.timezone", 'UTC'));
+        date_default_timezone_set(BaseConfig::getString("app.timezone", 'UTC'));
 
         // Initialize the router instance
         $this->router = new Router();