Merge pull request #224 from WebFiori/dev

refactor: Improments to Init Class
WebFiori · May 20, 2024 · a815f94 · a815f94
2 parents 1e4e6c2 + a480608
commit a815f94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/webfiori/framework/App.php b/webfiori/framework/App.php
@@ -532,6 +532,7 @@ private function initAutoLoader() {
         self::$AU = AutoLoader::get();
 
         if (!class_exists(APP_DIR.'\ini\InitAutoLoad')) {
+            Ini::createAppDirs();
             Ini::get()->createIniClass('InitAutoLoad', 'Add user-defined directories to the set of directories at which the framework will search for classes.');
         }
         call_user_func(APP_DIR.'\ini\InitAutoLoad::init');
@@ -542,7 +543,7 @@ private function initFrameworkVersionInfo() {
          *
          * @since 2.1
          */
-        define('WF_VERSION', '3.0.0-Beta.7');
+        define('WF_VERSION', '3.0.0-Beta.8');
         /**
          * A constant that tells the type of framework version.
          *
@@ -558,7 +559,7 @@ private function initFrameworkVersionInfo() {
          *
          * @since 2.1
          */
-        define('WF_RELEASE_DATE', '2024-05-13');
+        define('WF_RELEASE_DATE', '2024-05-20');
     }
 
     /**

diff --git a/webfiori/framework/Ini.php b/webfiori/framework/Ini.php
@@ -25,7 +25,6 @@ class Ini {
     private $docEmptyLine;
     private $docEnd;
     private $docStart;
-    private $since10;
     /**
      * An instance of the class.
      *
@@ -34,6 +33,10 @@ class Ini {
      */
     private static $singleton;
     private function __construct() {
+        $this->docStart = '/**';
+        $this->docEnd = ' **/';
+        $this->docEmptyLine = " *";
+        $this->blockEnd = '}';
     }
 
 
@@ -89,7 +92,6 @@ public function createIniClass(string $className, string $comment) {
             $this->docStart,
             " * $comment",
             $this->docEmptyLine,
-            $this->since10,
             $this->docEnd,
             'public static function init() {'
         ], 1);
@@ -125,7 +127,6 @@ public function createRoutesClass(string $className) {
         ClassDriver::a($cFile, $this->docStart, 1);
         ClassDriver::a($cFile, "     * Initialize system routes.");
         ClassDriver::a($cFile, $this->docEmptyLine, 1);
-        ClassDriver::a($cFile, $this->since10, 1);
         ClassDriver::a($cFile, $this->docEnd, 1);
         ClassDriver::a($cFile, "    public static function create() {");
         ClassDriver::a($cFile, "        //TODO: Add your own routes here.");