Merge branch 'dev' of https://github.com/WebFiori/framework into dev

Author: usernane

webfiori/framework/App.php

@@ -62,6 +62,10 @@ class App {
      *
      */
     const STATUS_NONE = 'NONE';
+    /**
+     * A constant that indicates that the status of the class is initiated.
+     */
+    const STATUS_INITIATED = 'INITIATED';
     /**
      * An instance of autoloader class.
      *
@@ -148,6 +152,7 @@ private function __construct() {
         {
             register_shutdown_function(function()
             {
+                $uriObj = Router::getRouteUri();
                 if ($uriObj !== null) {
                     $mdArr = $uriObj->getMiddleware();
 
@@ -250,10 +255,8 @@ public static function getClassLoader(): ClassLoader {
      * the constructor of the class is not called. 'INITIALIZING' if the execution
      * is happening inside the constructor of the class. 'INITIALIZED' once the
      * code in the constructor is executed.
-     *
-     * @since 1.0
      */
-    public static function getClassStatus() {
+    public static function getClassStatus() : string {
         return self::$ClassStatus;
     }
     /**
@@ -280,13 +283,29 @@ public static function getConfig(): ConfigurationDriver {
     public static function getConfigDriver() : string {
         return self::$ConfigDriver;
     }
+    private static function getRoot() {
+        //Following lines of code assumes that the class exist on the folder: 
+        //\vendor\webfiori\framework\webfiori\framework
+        //Its used to construct the folder at which index file will exist at
+        $vendorPath = '\vendor\webfiori\framework\webfiori\framework';
+        $rootPath = substr(__DIR__, 0, strlen(__DIR__) - strlen($vendorPath));
+        return $rootPath;
+    }
     /**
      * Handel the request.
      * 
      * This method should only be called after the application has been initialized.
      * Its used to handle HTTP requests or start CLI processing.
      */
     public static function handle() {
+        
+        if (self::$ClassStatus == self::STATUS_NONE) {
+            $publicFolderName = 'public';
+            self::initiate('app', $publicFolderName, self::getRoot().DIRECTORY_SEPARATOR.$publicFolderName);
+        }
+        if (self::$ClassStatus == self::STATUS_INITIATED) {
+            self::start();
+        }
         if (self::$ClassStatus == self::STATUS_INITIALIZED) {
             if (App::getRunner()->isCLI() === true) {
                 App::getRunner()->start();
@@ -311,14 +330,17 @@ public static function handle() {
      * @param string $indexDir The directory at which index file exist at.
      * Usually, its the value of the constant __DIR__.
      */
-    public static function initiate(string $appFolder, string $publicFolder = 'public', string $indexDir = __DIR__) {
+    public static function initiate(string $appFolder = 'app', string $publicFolder = 'public', string $indexDir = __DIR__) {
         if (!defined('DS')) {
             /**
              * Directory separator.
              */
             define('DS', DIRECTORY_SEPARATOR);
         }
         if (!defined('ROOT_PATH')) {
+            if ($indexDir == __DIR__) {
+                $indexDir = self::getRoot().DS.$publicFolder;
+            }
             /**
              * Path to source folder.
              */
@@ -346,6 +368,7 @@ public static function initiate(string $appFolder, string $publicFolder = 'publi
         self::checkStandardLibs();
         self::checkStdInOut();
         self::initFrameworkVersionInfo();
+        self::$ClassStatus = self::STATUS_INITIATED;
     }
     /**
      * Returns an instance which represents the class that is used to run the
@@ -432,12 +455,12 @@ public static function setConfigDriver(string $clazz) {
      * @since 1.0
      */
     public static function start(): App {
-        if (self::$ClassStatus == 'NONE') {
+        if (self::$ClassStatus == self::STATUS_NONE || self::$ClassStatus == self::STATUS_INITIATED) {
             if (self::$LC === null) {
-                self::$ClassStatus = 'INITIALIZING';
+                self::$ClassStatus = self::STATUS_INITIALIZING;
                 self::$LC = new App();
             }
-        } else if (self::$ClassStatus == 'INITIALIZING') {
+        } else if (self::$ClassStatus == self::STATUS_INITIALIZING) {
             throw new InitializationException('Using the core class while it is not fully initialized.');
         }
 

webfiori/framework/middleware/MiddlewareManager.php

@@ -10,21 +10,19 @@
  */
 namespace webfiori\framework\middleware;
 
-use webfiori\collections\LinkedList;
+use Exception;
+
 /**
  * This class is used to manage the operations which are related to middleware.
  *
  * @author Ibrahim
  *
- * @since 1.0
- *
- * @since 2.0.0
  */
 class MiddlewareManager {
     private static $inst;
     /**
      *
-     * @var LinkedList
+     * @var array
      */
     private $middlewareList;
     private function __construct() {
@@ -38,8 +36,6 @@ private function __construct() {
      * @return array The method will return a linked list with all
      * middleware in the group. If no group which has the given name exist, the
      * list will be empty.
-     *
-     * @since 1.0
      */
     public static function getGroup(string $groupName) : array {
         $list = [];
@@ -61,8 +57,6 @@ public static function getGroup(string $groupName) : array {
      * @return AbstractMiddleware|null If a middleware with the given name is
      * found, the method will return it. Other than that, the method will return
      * null.
-     *
-     * @since 1.0
      */
     public static function getMiddleware(string $name) {
         $mdList = self::get()->middlewareList;
@@ -76,18 +70,26 @@ public static function getMiddleware(string $name) {
     /**
      * Register a new middleware.
      *
-     * @param AbstractMiddleware $middleware The middleware that will be registered.
-     *
+     * @param AbstractMiddleware|string $middleware The middleware that will be registered.
      */
-    public static function register(AbstractMiddleware $middleware) {
-        self::get()->middlewareList[] = $middleware;
+    public static function register($middleware) : bool {
+        if (gettype($middleware) == 'string') {
+            try {
+                $middleware = new $middleware();
+            } catch (Exception $exc) {
+                return false;
+            }
+        }
+        if ($middleware instanceof AbstractMiddleware) {
+            self::get()->middlewareList[] = $middleware;
+            return true;
+        }
+        return false;
     }
     /**
      * Removes a middleware given its name.
      *
      * @param string $name The name of the middleware.
-     *
-     * @since 1.0
      */
     public static function remove(string $name) {
         $manager = self::get();

webfiori/framework/router/RouterUri.php

@@ -267,7 +267,7 @@ public function getLanguages() : array {
     public function getMiddleware() : array {
         if (count($this->assignedMiddlewareList) != count($this->sortedMiddleeareList)) {
             $compareFunc = function ($a, $b) {
-                return $b->getPriority() - $a->getPriority();
+                return $a->compare($b);
             };
             $this->sortedMiddleeareList = $this->assignedMiddlewareList;