[RFC Implementation] Merge Router into Core

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "leafs/leaf",
-	"description": "Simple, performant and powerful PHP micro-framework for rapid web app & API development",
+	"description": "Elegant PHP for modern developers",
 	"keywords": [
 		"microframework",
 		"rest",
@@ -33,7 +33,6 @@
 	"require": {
 		"php": "^7.4|^8.0",
 		"leafs/http": "*",
-		"leafs/router": "*",
 		"leafs/anchor": "*",
 		"leafs/exception": "*"
 	},

src/App.php

@@ -49,11 +49,12 @@ public function __construct(array $userSettings = [])
     protected function loadConfig(array $userSettings = [])
     {
         if (!empty($userSettings)) {
-            Config::set($userSettings);
+            Config::set(array_merge($userSettings, [
+                'mode' => _env('APP_ENV', Config::getStatic('mode')),
+            ]));
         }
 
         $this->setupDefaultContainer();
-        $this->loadViewEngines();
     }
 
     protected function setupErrorHandler()
@@ -90,22 +91,6 @@ public function register($name, $value)
         Config::singleton($name, $value);
     }
 
-    /**
-     * This method loads all added view engines
-     */
-    public function loadViewEngines()
-    {
-        $views = View::$engines;
-
-        if (!empty($views)) {
-            foreach ($views as $key => $value) {
-                Config::singleton($key, function () use ($value) {
-                    return $value;
-                });
-            }
-        }
-    }
-
     private function setupDefaultContainer()
     {
         Config::singleton('request', function () {
@@ -202,6 +187,27 @@ public function cors($options = [])
         }
     }
 
+    /**
+     * Add CSRF protection to your app
+     *
+     * @param array $options Config for csrf
+     */
+    public function csrf($options = [])
+    {
+        if (!\class_exists('Leaf\Anchor\CSRF')) {
+            \trigger_error('CSRF module not found! Run `leaf install csrf` or `composer require leafs/csrf` to install the CSRF module. This is required to configure CSRF.');
+        }
+
+        if (!Anchor\CSRF::token()) {
+            Anchor\CSRF::init();
+            Anchor\CSRF::config($options);
+        }
+
+        $this->use(function () {
+            Anchor\CSRF::validate();
+        });
+    }
+
     /**
      * Create a route handled by websocket (requires Eien module)
      *

src/Config.php

@@ -25,7 +25,7 @@ class Config
         'log.level' => null,
         'log.enabled' => false,
         'log.dir' => __DIR__ . '/../../../../storage/logs/',
-        'log.file' => 'log.txt',
+        'log.file' => 'app.log',
         'log.open' => true,
         'mode' => 'development',
         'scripts' => [],