feat(): Add PSR-12 for phpcs and fix up the styling along with it

markhughes · Mar 12, 2021 · 3b8536e · 3b8536e
1 parent 39e22ba
commit 3b8536e
Show file tree

Hide file tree

Showing 6 changed files with 395 additions and 34 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,6 @@
 {
-    "editor.tabSize": 2
+    "editor.tabSize": 4,
+    "phpcs.ignorePatterns": [
+        "vendor/"
+    ]
 }
diff --git a/app/config/config.php b/app/config/config.php
@@ -15,41 +15,25 @@
 // FLIGHT CONFIG
 // -------------------------------------------------- //
 
-Flight::set("flight.views.path", __DIR__ . "/../resources/views/");
+define("FLIGHT_SET_VARS", [
+    'flight.views.path' => __DIR__ . "/../resources/views/"
+]);
 
 // -------------------------------------------------- //
 // MONOLOG
 // -------------------------------------------------- //
 
-$logger = new Logger(APP_NAME);
+define("LOG_HANDLERS", [
+    new StreamHandler(__DIR__ . "/../../var/logs/application.log", Logger::DEBUG),
+    new FirePHPHandler(),
+]);
 
-$logger->pushHandler(new StreamHandler(__DIR__ . "/../../var/logs/application.log", Logger::DEBUG));
-$logger->pushHandler(new FirePHPHandler());
 
 // -------------------------------------------------- //
 // TWIG TEMPLATES
 // -------------------------------------------------- //
 
-$twig_loader = new Twig_Loader_Filesystem(Flight::get("flight.views.path"));
-$twig_config = [
+define("TWIG_CONFIG", [
     "cache" => __DIR__ . "/../../var/cache/twig/",
     "debug" => DEBUG,
-];
-
-Flight::register("view", "Twig_Environment", [ $twig_loader, $twig_config ], function ($twig) {
-    $twig->addExtension(new Twig_Extensions_Extension_Text());
-
-    if (function_exists("collator_create")) {
-        $twig->addExtension(new Twig_Extensions_Extension_Intl());
-    }
-
-    if (DEBUG) {
-        $twig->addExtension(new Twig_Extension_Debug());
-    }
-});
-
-// -------------------------------------------------- //
-// ROUTES
-// -------------------------------------------------- //
-
-require_once("routes.php");
+]);
diff --git a/app/config/routes.php b/app/config/routes.php
@@ -10,11 +10,11 @@
 // MAPPINGS
 // -------------------------------------------------- //
 
-Flight::map("notFound", function() {
+Flight::map("notFound", function () {
     Flight::render("404", []);
 });
 
-Flight::map("error", function($exception) {
+Flight::map("error", function ($exception) {
     global $logger;
 
     $logger->error($exception);