Refactors

.github/workflows/php.yml

@@ -0,0 +1,39 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ "main", "refactors" ]
+  pull_request:
+    branches: [ "main", "refactors" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate --strict
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v3
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress
+
+    - name: Start PHP Development Server
+      run: php -S localhost:61001 -t public &
+
+    - name: Run ci suite
+      run: composer run-script ci

.gitignore

@@ -7,3 +7,9 @@ app/cache/
 .DS_Store
 *.sublime-*
 biome.*
+.phpunit.result.cache
+node_modules/
+tests/cache/
+.coverage
+.runway-config.json
+apm.db*

.husky/pre-commit

@@ -0,0 +1,2 @@
+composer validate --no-ansi
+composer ci

.runway-config-sample.json

@@ -0,0 +1,6 @@
+{
+    "apm": {
+        "source_type": "sqlite",
+        "dest_db_dsn": "sqlite::memory:"
+    }
+}

app/config/bootstrap.php

@@ -6,30 +6,20 @@
  * for every request made to the application.
  */
 
-$ds = DIRECTORY_SEPARATOR;
-require_once __DIR__ . $ds . '..' . $ds . '..' . $ds . 'vendor' . $ds . 'autoload.php';
+use app\utils\Config;
 
-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();
-
 /*
  * 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);
-
-// Whip out the ol' router and we'll pass that to the routes file
-$router = $app->router();
+Flight::set('config', new Config(require __DIR__ . '/config.php'));
 
 /*
  * Load the routes file. the $router variable above is passed into the routes.php
@@ -38,7 +28,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.
@@ -63,11 +53,12 @@
  * 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.
-$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,13 @@
 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');
-}
-
-/*
- * Set some flight variables
- */
-if (empty($app)) {
-    $app = Flight::app();
-}
+setlocale(LC_ALL, 'en_US.UTF-8');
 
-$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::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
 
 /*
  * Get Tracy up and running
@@ -44,15 +28,16 @@
  * 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 bar is visible, then content-length can not be set by Flight
 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);
+    Flight::set('flight.content_length', false);
+    (new Container)->get(TracyExtensionLoader::class);
 }
 
 /*