completed the route map implementation

Author: dconco

.env

@@ -82,15 +82,15 @@ class Route extends Controller implements RouteInterface
 	 *
 	 *   ------------------------------------------------------------------------
 	 */
-	public static function any (
-	 array|string $route,
-	 mixed $callback,
-	 string $method = '*',
+	public static function any(
+		array|string $route,
+		mixed $callback,
+		string $method = '*',
 	): self {
 		self::$any = [
-		 'route' => $route,
-		 'method' => $method,
-		 'callback' => $callback,
+			'route' => $route,
+			'method' => $method,
+			'callback' => $callback,
 		];
 
 		self::$route[] = $route;
@@ -105,11 +105,11 @@ public static function any (
 	 * @param string $method Request method
 	 * @param string|array $route Route parameter
 	 */
-	public static function map (string $method, string|array $route): self
+	public static function map(string $method, string|array $route): self
 	{
 		self::$map = [
-		 'method' => $method,
-		 'route' => $route,
+			'method' => $method,
+			'route' => $route,
 		];
 		self::$route[] = $route;
 		return new self();
@@ -121,18 +121,14 @@ public static function map (string $method, string|array $route): self
 	 *
 	 * @param string $name Set the name of the route
 	 */
-	public function name (string $name): self
+	public function name(string $name): self
 	{
-		if (is_array(end(self::$route)))
-		{
-			for ($i = 0; $i < count(end(self::$route)); $i++)
-			{
+		if (is_array(end(self::$route))) {
+			for ($i = 0; $i < count(end(self::$route)); $i++) {
 				add_route_name("$name::$i", end(self::$route)[$i]);
 				self::$routes["$name::$i"] = end(self::$route)[$i];
 			}
-		}
-		else
-		{
+		} else {
 			add_route_name($name, end(self::$route));
 			self::$routes[$name] = end(self::$route);
 		}
@@ -146,20 +142,17 @@ public function name (string $name): self
 	 * @param string $route
 	 * @param Closure $callback
 	 */
-	public function route (string $route, Closure $callback): self
+	public function route(string $route, callable $callback): self
 	{
-		$route = rtrim('/', self::$map['route']) . '/' . ltrim('/', $route);
+		$route = rtrim(self::$map['route'], '/') . '/' . ltrim($route, '/');
 
-		if (self::$map)
-		{
+		if (self::$map) {
 			$this->mapRoute = [
-			 'route' => $route,
-			 'method' => self::$map['method'],
-			 'callback' => $callback,
+				'route' => $route,
+				'method' => '*',
+				'callback' => $callback,
 			];
-		}
-		else
-		{
+		} else {
 			throw new Exception('There is no map to route.');
 		}
 		self::$route[] = $route;
@@ -172,10 +165,9 @@ public function route (string $route, Closure $callback): self
 	 *
 	 * @param mixed $callback
 	 */
-	public function action (mixed $callback): self
+	public function action(mixed $callback): self
 	{
-		if (self::$map)
-		{
+		if (self::$map) {
 			$this->action = $callback;
 		}
 		return $this;
@@ -190,8 +182,7 @@ public function action (mixed $callback): self
 	 */
 	public function use(string $controller): self
 	{
-		if (self::$map)
-		{
+		if (self::$map) {
 			$this->use = $controller;
 		}
 		return $this;
@@ -203,10 +194,9 @@ public function use(string $controller): self
 	 *
 	 * @param string $file
 	 */
-	public function file (string $file): self
+	public function file(string $file): self
 	{
-		if (self::$map)
-		{
+		if (self::$map) {
 			$this->file = $file;
 		}
 		return $this;
@@ -221,13 +211,13 @@ public function file (string $file): self
 	 * @param Closure $closure The closure to handle invalid parameter types.
 	 * @return self Returns the current instance for method chaining.
 	 */
-	public function handleInvalidParameterType (Closure $closure): self
+	public function handleInvalidParameterType(Closure $closure): self
 	{
 		$this->handleInvalidParameterType = $closure;
 		return $this;
 	}
-	
-	public function caseSensitive (): self
+
+	public function caseSensitive(): self
 	{
 		$this->caseSensitive = true;
 		return $this;
@@ -239,10 +229,9 @@ public function caseSensitive (): self
 	 * @param string ...$guards String parameters of registered guards.
 	 * @return self
 	 */
-	public function withGuard (string ...$guards): self
+	public function withGuard(string ...$guards): self
 	{
-		if (self::$map || self::$method || self::$view)
-		{
+		if (self::$map || self::$method || self::$view) {
 			$this->guards = $guards;
 		}
 		return $this;
@@ -263,11 +252,11 @@ public function withGuard (string ...$guards): self
 	 *
 	 *   ---------------------------------------------------------------------------
 	 */
-	public static function view (array|string $route, string $view): self
+	public static function view(array|string $route, string $view): self
 	{
 		self::$view = [
-		 'route' => $route,
-		 'view' => $view,
+			'route' => $route,
+			'view' => $view,
 		];
 
 		self::$route[] = $route;
@@ -287,15 +276,15 @@ public static function view (array|string $route, string $view): self
 	 *
 	 * ---------------------------------------------------------------
 	 */
-	public static function redirect (
-	 string $route,
-	 string $new_url,
-	 int $code = 302,
+	public static function redirect(
+		string $route,
+		string $new_url,
+		int $code = 302,
 	): self {
 		self::$redirect = [
-		 'route' => $route,
-		 'new_url' => $new_url,
-		 'code' => $code,
+			'route' => $route,
+			'new_url' => $new_url,
+			'code' => $code,
 		];
 
 		self::$route[] = $route;
@@ -311,12 +300,12 @@ public static function redirect (
 	 *
 	 *   --------------------------------------------------------------
 	 */
-	public static function get (array|string $route, $callback): self
+	public static function get(array|string $route, $callback): self
 	{
 		self::$method = [
-		 'route' => $route,
-		 'method' => 'GET',
-		 'callback' => $callback,
+			'route' => $route,
+			'method' => 'GET',
+			'callback' => $callback,
 		];
 
 		self::$route[] = $route;
@@ -332,12 +321,12 @@ public static function get (array|string $route, $callback): self
 	 *
 	 *   --------------------------------------------------------------
 	 */
-	public static function post (array|string $route, $callback): self
+	public static function post(array|string $route, $callback): self
 	{
 		self::$method = [
-		 'route' => $route,
-		 'method' => 'POST',
-		 'callback' => $callback,
+			'route' => $route,
+			'method' => 'POST',
+			'callback' => $callback,
 		];
 
 		self::$route[] = $route;
@@ -353,12 +342,12 @@ public static function post (array|string $route, $callback): self
 	 *
 	 *   --------------------------------------------------------------
 	 */
-	public static function put (array|string $route, $callback): self
+	public static function put(array|string $route, $callback): self
 	{
 		self::$method = [
-		 'route' => $route,
-		 'method' => 'PUT',
-		 'callback' => $callback,
+			'route' => $route,
+			'method' => 'PUT',
+			'callback' => $callback,
 		];
 
 		self::$route[] = $route;
@@ -374,12 +363,12 @@ public static function put (array|string $route, $callback): self
 	 *
 	 *   --------------------------------------------------------------
 	 */
-	public static function patch (array|string $route, $callback): self
+	public static function patch(array|string $route, $callback): self
 	{
 		self::$method = [
-		 'route' => $route,
-		 'method' => 'PATCH',
-		 'callback' => $callback,
+			'route' => $route,
+			'method' => 'PATCH',
+			'callback' => $callback,
 		];
 
 		self::$route[] = $route;
@@ -395,86 +384,74 @@ public static function patch (array|string $route, $callback): self
 	 *
 	 *   --------------------------------------------------------------
 	 */
-	public static function delete (array|string $route, $callback): self
+	public static function delete(array|string $route, $callback): self
 	{
 		self::$method = [
-		 'route' => $route,
-		 'method' => 'DELETE',
-		 'callback' => $callback,
+			'route' => $route,
+			'method' => 'DELETE',
+			'callback' => $callback,
 		];
 
 		self::$route[] = $route;
 		return new self();
 	}
 
-	public function __destruct ()
+	public function __destruct()
 	{
 		$route_index = end(self::$route);
 		$route_index = is_array($route_index) ? $route_index[0] : $route_index;
 
-		$GLOBALS['__registered_routes'][$route_index][
-		 'caseSensitive'
-		] = $this->caseSensitive;
+		$GLOBALS['__registered_routes'][$route_index]['caseSensitive'] =
+			$this->caseSensitive;
 
-		if (self::$map !== null)
-		{
+		if (self::$map !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['map'] = self::$map;
 		}
 
-		if ($this->guards !== null)
-		{
+		if ($this->guards !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['guards'] =
-			 $this->guards;
+				$this->guards;
 		}
 
-		if (self::$redirect !== null)
-		{
+		if (self::$redirect !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['redirect'] =
-			 self::$redirect;
+				self::$redirect;
 		}
 
-		if ($this->action !== null)
-		{
+		if ($this->action !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['action'] =
-			 $this->action;
+				$this->action;
 		}
 
-		if ($this->mapRoute !== null)
-		{
+		if ($this->mapRoute !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['mapRoute'] =
-			 $this->mapRoute;
+				$this->mapRoute;
 		}
 
-		if (self::$any !== null)
-		{
+		if (self::$any !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['any'] = self::$any;
 		}
 
-		if ($this->use !== null)
-		{
+		if ($this->use !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['use'] = $this->use;
 		}
 
-		if ($this->file !== null)
-		{
+		if ($this->file !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['file'] = $this->file;
 		}
 
-		if ($this->handleInvalidParameterType !== null)
-		{
+		if ($this->handleInvalidParameterType !== null) {
 			$GLOBALS['__registered_routes'][$route_index][
-			 'handleInvalidParameterType'
+				'handleInvalidParameterType'
 			] = $this->handleInvalidParameterType;
 		}
 
-		if (self::$method !== null)
-		{
+		if (self::$method !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['method'] =
-			 self::$method;
+				self::$method;
 		}
 
-		if (self::$view !== null)
-		{
+		if (self::$view !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['view'] = self::$view;
 		}
 	}

Router/Route.php

@@ -5,6 +5,6 @@
 use PhpSlides\Core\Foundation\Application;
 
 return (new FileLoader())
- ->safeLoad(Application::$configsDir . 'jwt.php')
- ->getLoad() ?:
- [];
+	->safeLoad(Application::$configsDir . 'jwt.php')
+	->getLoad() ?:
+	[];