Refactors

.gitignore

@@ -8,4 +8,5 @@ app/cache/
 *.sublime-*
 biome.*
 .runway-config.json
-apm.db*
+apm.db*
+apm_fallback.log

README.md

@@ -33,4 +33,4 @@ php82 -S localhost:8000 -t public/
 
 Please note that the additional translations are provided by ChatGPT and are not official translations. Please don't make a PR to fix a translation as when the documentation is retranslated, your contribution will be lost. 
 
-If your translation is really not good, please open an issue and we will look into possible having you maintain that translation without the assistance of ChatGPT.
+If your translation is really not good, please open an issue and we will look into possible having you maintain that translation without the assistance of ChatGPT.

app/config/bootstrap.php

@@ -6,30 +6,32 @@
  * for every request made to the application.
  */
 
-$ds = DIRECTORY_SEPARATOR;
-require_once __DIR__ . $ds . '..' . $ds . '..' . $ds . 'vendor' . $ds . 'autoload.php';
+use app\utils\CustomEngine;
+use app\utils\SwooleServerDriver;
+use flight\Container;
+use flight\Engine;
 
-if (file_exists(__DIR__ . $ds . 'config.php') === false) {
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+if (!file_exists(__DIR__ . '/config.php')) {
     Flight::halt(500, 'Config file not found. Please create a config.php file in the app/config directory to get started.');
 }
 
-// this has to be hard code required because autoload hasn't been registered yet.
-require_once __DIR__ . $ds . '..' . $ds . 'utils' . $ds . 'CustomFlight.php';
-
 // It is better practice to not use static methods for everything. It makes your
 // app much more difficult to unit test easily.
-$app = Flight::app();
+$app = Container::getInstance()->get(CustomEngine::class);
+Flight::setEngine($app);
 
 /*
  * Load the config file
  * P.S. When you require a php file and that file returns an array, the array
  * will be returned by the require statement where you can assign it to a var.
  */
-$config = require __DIR__ . $ds . 'config.php';
-$app->set('config', $config);
+$config = require __DIR__ . '/config.php';
+Flight::set('config', $config);
 
 // Whip out the ol' router and we'll pass that to the routes file
-$router = $app->router();
+$router = Flight::router();
 
 /*
  * Load the routes file. the $router variable above is passed into the routes.php
@@ -38,7 +40,7 @@
  * When someone hits that URL, you point them to a function or method
  * that will handle the request.
  */
-require_once __DIR__ . $ds . 'routes.php';
+require_once __DIR__ . '/routes.php';
 
 /*
  * You additionally could just define the routes in this file. It's up to you.
@@ -55,33 +57,40 @@
  * Need caching? You can setup a Redis service
  * Need to send email? You can setup a mailgun/sendgrid/whatever service to send emails.
  * Need to send SMS? You can setup a Twilio service.
- * 
+ *
  * All the services and how they are configured are setup in the services file.
  * In many cases, services are all attached to something called a "services container"
  * or more simply, a "container". The container manages if you should share the same
  * service, or if you should create a new instance of the service every time you need it.
  * That's a discussion for another day. Suffice to say, that Flight has a basic concept
  * of a services container by registering classes to the Engine class.
  */
-require_once __DIR__ . $ds . 'services.php';
+require_once __DIR__ . '/services.php';
 
 // At this point, your app should have all the instructions it needs and it'll
 // "start" processing everything. This is where the magic happens.
 
 // This is where swoole will start listening for requests and processing them.
-if(!defined("NOT_SWOOLE")) {
-    // Require the SwooleServerDriver class since we're running in Swoole mode.
-    require_once(__DIR__.'/../utils/SwooleServerDriver.php');
+if (!defined("NOT_SWOOLE")) {
+    if (!class_exists('Swoole\Runtime')) {
+        throw new Exception('Swoole is not installed. Please install Swoole or define the NOT_SWOOLE constant in public/index.php to run without Swoole.');
+    }
+
+    call_user_func('Swoole\Runtime', 'enableCoroutine');
+
+    $swooleServerDriver = new SwooleServerDriver(
+        '127.0.0.1',
+        9501,
+        Container::getInstance()->get(Engine::class)
+    );
 
-    Swoole\Runtime::enableCoroutine();
-    $Swoole_Server = new app\utils\SwooleServerDriver('127.0.0.1', 9501, $app);
-    $Swoole_Server->start();
+    $swooleServerDriver->start();
 } else {
-    $app->start();
+    Flight::start();
 }
 /*
  .----..---.  .--.  .----.  .---.     .---. .-. .-.  .--.  .---.    .----. .-. .-..----. .----..-.  .-.
-{ {__ {_   _}/ {} \ | {}  }{_   _}   {_   _}| {_} | / {} \{_   _}   | {}  }| { } || {}  }| {}  }\ \/ / 
-.-._} } | | /  /\  \| .-. \  | |       | |  | { } |/  /\  \ | |     | .--' | {_} || .--' | .--'  }  {  
-`----'  `-' `-'  `-'`-' `-'  `-'       `-'  `-' `-'`-'  `-' `-'     `-'    `-----'`-'    `-'     `--'  
+{ {__ {_   _}/ {} \ | {}  }{_   _}   {_   _}| {_} | / {} \{_   _}   | {}  }| { } || {}  }| {}  }\ \/ /
+.-._} } | | /  /\  \| .-. \  | |       | |  | { } |/  /\  \ | |     | .--' | {_} || .--' | .--'  }  {
+`----'  `-' `-'  `-'`-' `-'  `-'       `-'  `-' `-'`-'  `-' `-'     `-'    `-----'`-'    `-'     `--'
 */

app/config/config_sample.php

@@ -1,5 +1,6 @@
 <?php
 
+use flight\Container;
 use flight\debug\tracy\TracyExtensionLoader;
 use Tracy\Debugger;
 
@@ -10,30 +11,22 @@
 error_reporting(E_ALL);
 
 // Set the default character encoding
-if (function_exists('mb_internal_encoding') === true) {
-    mb_internal_encoding('UTF-8');
-}
+mb_internal_encoding('UTF-8');
 
 // Set the default locale
-if (function_exists('setlocale') === true) {
-    setlocale(LC_ALL, 'en_US.UTF-8');
-}
+setlocale(LC_ALL, 'en_US.UTF-8');
 
 /*
  * Set some flight variables
  */
-if (empty($app)) {
-    $app = Flight::app();
-}
-
-$app->path(__DIR__ . $ds . '..' . $ds . '..');
-$app->set('flight.base_url', '/'); // if this is in a subdirectory, you'll need to change this
-$app->set('flight.case_sensitive', false); // if you want case sensitive routes, set this to true
-$app->set('flight.log_errors', true); // if you want to log errors, set this to true
-$app->set('flight.handle_errors', false); // if you want flight to handle errors, set this to true
-$app->set('flight.views.path', __DIR__ . $ds . '..' . $ds . 'views'); // set the path to your view/template/ui files
-$app->set('flight.views.extension', '.php'); // set the file extension for your view/template/ui files
-$app->set('flight.content_length', true); // if flight should send a content length header
+Flight::path(__DIR__ . '/../..');
+Flight::set('flight.base_url', '/'); // if this is in a subdirectory, you'll need to change this
+Flight::set('flight.case_sensitive', false); // if you want case sensitive routes, set this to true
+Flight::set('flight.log_errors', true); // if you want to log errors, set this to true
+Flight::set('flight.handle_errors', false); // if you want flight to handle errors, set this to true
+Flight::set('flight.views.path', __DIR__ . '/../views'); // set the path to your view/template/ui files
+Flight::set('flight.views.extension', '.php'); // set the file extension for your view/template/ui files
+Flight::set('flight.content_length', true); // if flight should send a content length header
 
 /*
  * Get Tracy up and running
@@ -44,26 +37,26 @@
  * https://tracy.nette.org/
  */
 Debugger::enable(); // auto tries to figure out your environment
-// Debugger::enable(Debugger::DEVELOPMENT) // sometimes you have to be explicit (also Debugger::PRODUCTION)
+// Debugger::enable(Debugger::Development); // sometimes you have to be explicit (also Debugger::PRODUCTION)
 // Debugger::enable('23.75.345.200'); // you can also provide an array of IP addresses
-Debugger::$logDirectory = __DIR__ . $ds . '..' . $ds . 'log';
+Debugger::$logDirectory = __DIR__ . '/../log';
 Debugger::$strictMode = true; // display all errors
 // Debugger::$strictMode = E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED; // all errors except deprecated notices
 
 if (Debugger::$showBar) {
-    $app->set('flight.content_length', false); // if Debugger bar is visible, then content-length can not be set by Flight
-    new TracyExtensionLoader($app);
+    // if Debugger bar is visible, then content-length can not be set by Flight
+    Flight::set('flight.content_length', false);
+    Container::getInstance()->get(TracyExtensionLoader::class);
 }
 
-/* 
+/*
  * This is where you will store database credentials, api credentials
  * and other sensitive information. This file will not be tracked by git
  * as you shouldn't be pushing sensitive information to a public or private
  * repository.
- * 
+ *
  * What you store here is totally up to you.
  */
-
 define('ENVIRONMENT', 'development');
 
 return [];