👽 configured leaf mvc with v2.5.0 changes

Author: mychidarko

App/Routes/index.php

@@ -1,5 +1,7 @@
 <?php
 
+/**@var Leaf\App $app */
+
 /*
 |--------------------------------------------------------------------------
 | Set up 404 handler
@@ -9,8 +11,6 @@
 |
 */
 
-use function Leaf\Traits\auth;
-
 $app->set404(function() {
 	response()->headers->status(404);
 	response()->page(views_path("errors/404.html", false));
@@ -27,6 +27,6 @@
 */
 $app->setNamespace("\App\Controllers");
 
-// New in Leaf v2.4.1.
-// You can assign a view directly
-$app->view("/", "index");
+$app->get("/", function () {
+    echo view("index");
+});

Config/functions.php

@@ -39,11 +39,11 @@ function d()
 if (!function_exists('dbRow')) {
 	/**
 	 * Return a db row by it's id
-	 * 
+	 *
 	 * @param string $table The table to find row
 	 * @param string|int $row_id The row's id
 	 * @param string $columns The columns to get
-	 * 
+	 *
 	 * @return array|null The database field
 	 */
 	function dbRow($table, $row_id, $columns = "*")
@@ -56,7 +56,7 @@ function dbRow($table, $row_id, $columns = "*")
 if (!function_exists('email')) {
 	/**
 	 * Write and send an email
-	 * 
+	 *
 	 * @param array $email The email block to write and send
 	 */
 	function email(array $email)
@@ -86,6 +86,16 @@ function fs()
 	}
 }
 
+if (!function_exists('flash')) {
+    /**
+     * Return Leaf's flash object
+     */
+    function flash()
+    {
+        return \Leaf\Flash::class;
+    }
+}
+
 if (!function_exists('hasAuth')) {
 	/**
 	 * Find out if there's an active sesion
@@ -99,9 +109,9 @@ function hasAuth()
 if (!function_exists('json')) {
 	/**
 	 * json uses Leaf's now `json` method
-	 * 
+	 *
 	 * json() packs in a bunch of functionality and customization into one method
-	 * 
+	 *
 	 * @param array|string|object $data The data to output
 	 * @param int $code HTTP Status code for response, it's set in header
 	 * @param bool $showCode Show response code in response body?
@@ -116,7 +126,7 @@ function json($data, int $code = 200, bool $showCode = false, bool $useMessage =
 if (!function_exists('markup')) {
 	/**
 	 * Output markup as response
-	 * 
+	 *
 	 * @param string $data The markup to output
 	 * @param int $code The http status code
 	 */
@@ -147,7 +157,7 @@ function render(string $view, array $data = [], array $mergeData = [])
 if (!function_exists('request')) {
 	/**
 	 * Return request or request data
-	 * 
+	 *
 	 * @param array|string $data — Get data from request
 	 */
 	function request($data = null)
@@ -160,7 +170,7 @@ function request($data = null)
 if (!function_exists('requestBody')) {
 	/**
 	 * Get request body
-	 * 
+	 *
 	 * @param bool $safeData — Sanitize output
 	 */
 	function requestBody($safeOutput = true)
@@ -172,7 +182,7 @@ function requestBody($safeOutput = true)
 if (!function_exists('requestData')) {
 	/**
 	 * Get request data
-	 * 
+	 *
 	 * @param string|array $param The item(s) to get from request
 	 * @param bool $safeData — Sanitize output
 	 */
@@ -186,7 +196,7 @@ function requestData($param, $safeOutput = true, $assoc = false)
 if (!function_exists('response')) {
 	/**
 	 * Return response or set response data
-	 * 
+	 *
 	 * @param array|string $data — The JSON response to set
 	 */
 	function response($data = null)
@@ -211,7 +221,7 @@ function Route($methods, $pattern, $fn)
 if (!function_exists('session')) {
 	/**
 	 * Get a session variable or the session object
-	 * 
+	 *
 	 * @param string|null $key The variable to get
 	 */
 	function session($key = null)
@@ -237,7 +247,7 @@ function sessionUser()
 if (!function_exists('setHeader')) {
 	/**
 	 * Set a response header
-	 * 
+	 *
 	 * @param string|array $key The header key
 	 * @param string $value Header value
 	 * @param bool $replace Replace header if exists
@@ -271,7 +281,7 @@ function throwErr($error, int $code = 500, bool $useMessage = false)
 if (!function_exists('view')) {
 	/**
 	 * Return a blade view
-	 * 
+	 *
 	 * @param string $view The view to return
 	 * @param array $data Data to pass into app
 	 * @param array $mergeData
@@ -283,6 +293,17 @@ function view(string $view, array $data = [], array $mergeData = [])
 	}
 }
 
+// App
+
+/**
+ * Get app configuration
+ */
+function AppConfig($setting = null)
+{
+	$config = require __DIR__ . "/app.php";
+	return !$setting ? $config : $config[$setting];
+}
+
 // Auth
 
 /**
@@ -334,7 +355,7 @@ function config_path($path = null)
 }
 
 /**
- * Storage directory path 
+ * Storage directory path
  */
 function storage_path($path = null, bool $slash = false)
 {

Config/view.php

@@ -11,7 +11,7 @@
     | the usual LeafMVC view path has already been registered for you.
     |
     */
-    "views_path" => views_path(),
+    "views_path" => views_path("", false),
 
     /*
     |--------------------------------------------------------------------------
@@ -24,7 +24,7 @@
     |
     */
     "cache_path" => storage_path('framework/views'),
-    
+
     /*
     |--------------------------------------------------------------------------
     | Template Engine [EXPERIMENTAL]