v1.0.0-beta.7

Author: alddesign

app/App.php

@@ -0,0 +1,47 @@
+<?php
+declare(strict_types = 1);
+namespace Alddesign\EzMvc;
+
+use Alddesign\EzMvc\System\Route;
+use Alddesign\EzMvc\System\Router;
+
+
+abstract class App
+{
+    
+    /**
+     * Gets call before user defined routes get applied to the request.
+     * Here you can add custom routers to the Router class
+     * 
+     * @see \Alddesign\EzMvc\System\Router The Router class also has infos about the current request
+     * @return void
+     */
+    public static function onRequestPreRoutes()
+    {
+        //Here you can reroute the request (this is not a redirect)
+        Router::addRoute(Route::newStartsWith('/Main/products', '/Product/list'));
+        Router::addRoute(Route::newRegex('/\/item.*/i', '/Product/list'));
+    }
+
+    /**
+     * Gets called after the user defined routes get applied to the request.
+     * 
+     * @see \Alddesign\EzMvc\System\Router The Router class has infos about the current request
+     * @return void
+     */
+    public static function onRequestPostRoutes()
+    {
+
+    }
+
+    /**
+     * Gets called after the routing and validation of the request url. At this point the request is valid (has controller and action)
+     * 
+     * @see \Alddesign\EzMvc\System\Router The Router class has infos about the current request
+     * @return void
+     */
+    public static function onRequestPostValidate()
+    {
+
+    }
+}

app/sample-database.sqlite

@@ -20,4 +20,4 @@
 define('EZ_PHP_DISPLAY_ERRORS', 'On'); //'On' or 'Off'. Specify if PHP shows runtime errors at all. See: https://www.php.net/manual/en/errorfunc.configuration.php#ini.display-errors 
 define('EZ_PHP_DISPLAY_STARTUP_ERRORS', 'On'); //'On' or 'Off'. Specify if PHP shows startup errors. See: https://www.php.net/manual/en/errorfunc.configuration.php#ini.display-startup-errors
 define('EZ_PHP_ERROR_REPORTING', -1); //PHP error reporting level. See: https://www.php.net/manual/en/function.error-reporting.php
-define('EZ_VERSION', 'v1.0.0-beta.5'); //Version of ez-mvc (just in case u wanna know)
+define('EZ_VERSION', 'v1.0.0-beta.7'); //Version of ez-mvc (just in case u wanna know)

composer.lock

@@ -6,6 +6,7 @@
 
 abstract class Helper
 {
+	private static $starts = [];
     /** 
 	 * A better implementation of PHP function var_dump();
 	 * 
@@ -197,6 +198,15 @@ public static function addStartingSlash(string $value)
 		return mb_substr($value, 0, 1) === '/' ? $value : '/'. $value;
 	}
 
+		/**
+	 * Adds a starting slash to an url, path or whatever if it doesnt exist
+	 * @return string
+	 */
+	public static function addStartingAndTrailingSlash(string $value)
+	{
+		return self::addStartingSlash(self::addTrailingSlash($value));
+	}
+
 	/**
 	 * Removes the starting slash of an url, path or whatever if there is one
 	 * @return string
@@ -305,7 +315,33 @@ public static function redirect(string $url, bool $literalUrl = false)
 		$url = $literalUrl ? $url : self::url($url);
 
 		header('Location: ' . $url);
-		die();
+		die;
+	}
+
+	/**
+	 * Short for htmlspecialchars()
+	 */
+	public static function h($text)
+	{
+		return htmlspecialchars((string)$text);
+	}
+
+	public static function start(int $i = 0)
+	{
+		self::$starts[$i] = microtime(true);
+	}
+
+	public static function end(int $i = 0, int $decimals = 3)
+	{
+		$e = microtime(true);
+		if(!isset(self::$starts[$i]))
+		{
+			return -1.0;
+		}
+		
+		$s = self::$starts[$i];
+		unset(self::$starts[$i]);
+		return round($s - $e, $decimals);
 	}
 }
 

config/config.php

@@ -13,3 +13,12 @@ function u(string $url)
 {
 	return \Alddesign\EzMvc\System\Helper::url($url);
 }
+
+/**
+ * Shorthand for \Alddesign\EzMvc\System\Helper::h($text)
+ * @return string
+ */
+function h($text)
+{
+	return \Alddesign\EzMvc\System\Helper::h($text);
+}

system/Helper.php

@@ -0,0 +1,74 @@
+<?php
+declare(strict_types = 1);
+namespace Alddesign\EzMvc\System;
+
+class Route
+{
+    public string $path = '';
+    public string $to = '';
+    public bool $isDefault = false;
+    public bool $isRegex = false;
+    public bool $isStartsWith = false;
+
+
+    private function __construct()
+    {
+
+    }
+
+    /** @return Route */
+    public static function newDefault(string $to)
+    {
+        $r = new Route();
+        $r->isDefault = true;
+        $r->to = $to;
+        return $r;
+    }
+
+    /** @return Route */
+    public static function newRegex(string $pathRegex, string $to)
+    {
+        $r = new Route();
+        $r->isRegex = true;
+        $r->path = $pathRegex;
+        $r->to = $to;
+        return $r;
+    }
+
+    /** @return Route */
+    public static function newStartsWith(string $pathStartsWith, string $to)
+    {
+        $r = new Route();
+        $r->isStartsWith = true;
+        $r->path = $pathStartsWith;
+        $r->to = $to;
+        return $r;
+    }
+
+    /** @return Route */
+    public static function new(string $path, string $to)
+    {
+        $r = new Route();
+        $r->path = $path;
+        $r->to = $to;
+        return $r;
+    }
+
+	public function applies($path)
+    {
+        if($this->isDefault)
+        {
+            return true;
+        }
+        elseif($this->isRegex)
+        {
+            return preg_match($this->path, $path) === 1;
+        }
+        elseif($this->isStartsWith)
+        {
+            return str_starts_with($path, $this->path);
+        }
+ 
+        return $path === $this->path || Helper::addTrailingSlash($path) === Helper::addTrailingSlash($this->path);
+    }
+}