Update RouterCommand class.

Author: izniburak

src/Router.php

@@ -445,7 +445,7 @@ private function addRoute($uri, $method, $callback, $settings)
 	*/
 	private function beforeAfterCommand($command)
 	{
-		return RouterCommand::beforeAfter(
+		return RouterCommand::getInstance()->beforeAfter(
 			$command, $this->middlewares[$command], $this->paths['middlewares'], $this->namespaces['middlewares']
 		);
 	}
@@ -457,7 +457,7 @@ private function beforeAfterCommand($command)
 	*/
 	private function runRouteCommand($command, $params = null)
 	{
-		RouterCommand::runRoute(
+		RouterCommand::getInstance()->runRoute(
 			$command, $params, $this->paths['controllers'], $this->namespaces['controllers']
 		);
 	}
@@ -472,16 +472,16 @@ public function runRouteMiddleware($middleware, $type)
 		if($type == 'before')
     {
       if(!is_null($middleware['group']))
-        RouterCommand::beforeAfter($middleware['group'][$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
+        RouterCommand::getInstance()->beforeAfter($middleware['group'][$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
 
-      RouterCommand::beforeAfter($middleware[$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
+      RouterCommand::getInstance()->beforeAfter($middleware[$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
     }
     else
     {
-      RouterCommand::beforeAfter($middleware[$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
+      RouterCommand::getInstance()->beforeAfter($middleware[$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
 
       if(!is_null($middleware['group']))
-        RouterCommand::beforeAfter($middleware['group'][$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
+        RouterCommand::getInstance()->beforeAfter($middleware['group'][$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
     }
   }
 

src/Router/RouterCommand.php

@@ -15,8 +15,30 @@
 
 class RouterCommand
 {
+  /**
+  * Class instance variable
+  */
+  protected static $instance = null;
 
-  public static function exception($message = '')
+  /**
+  * Get class instance
+  *
+  * @return PdoxObject
+  */
+  public static function getInstance()
+  {
+      if (null === self::$instance)
+          self::$instance = new static();
+
+      return self::$instance;
+  }
+
+  /**
+	* Throw new Exception for Router Error
+	*
+	* @return RouterException
+	*/
+  public function exception($message = '')
   {
     return new RouterException($message);
   }
@@ -26,13 +48,13 @@ public static function exception($message = '')
 	*
 	* @return true | false
 	*/
-	public static function beforeAfter($command, $middleware, $path = '', $namespace = '')
+	public function beforeAfter($command, $middleware, $path = '', $namespace = '')
 	{
 		if(!is_null($command))
 		{
 			if(is_array($command))
 				foreach ($command as $key => $value)
-					self::beforeAfter($value, $middleware);
+					$this->beforeAfter($value, $middleware);
 
 			elseif(is_object($command))
 				return call_user_func($command);
@@ -48,20 +70,20 @@ public static function beforeAfter($command, $middleware, $path = '', $namespace
 					$middlewareFile = realpath($path . $parts[0] . '/' . (str_replace($namespace, '', $segments[0])) .'.php');
 
 				if(!file_exists($middlewareFile))
-          return self::exception($segments[0] . ' middleware file is not found. Please, check file.');
+          return $this->exception($segments[0] . ' middleware file is not found. Please, check file.');
 
 				require_once($middlewareFile);
 				$controller = new $segments[0]();
 
 				if(in_array($segments[1], get_class_methods($controller)))
 					return call_user_func([$controller, $segments[1]]);
 				else
-          return self::exception($segments[1] . ' method is not found in <b>'.$segments[0].'</b> middleware. Please, check file.');
+          return $this->exception($segments[1] . ' method is not found in <b>'.$segments[0].'</b> middleware. Please, check file.');
 			}
 			else
 			{
 				if(!is_null($middleware[$command]) && isset($middleware[$command]))
-					self::beforeAfter($middleware[$command], $middleware);
+					$this->beforeAfter($middleware[$command], $middleware);
 				else
 					return false;
 			}
@@ -75,7 +97,7 @@ public static function beforeAfter($command, $middleware, $path = '', $namespace
 	*
 	* @return null
 	*/
-	public static function runRoute($command, $params = null, $path = '', $namespace = '')
+	public function runRoute($command, $params = null, $path = '', $namespace = '')
 	{
 		if(!is_object($command))
 		{
@@ -88,7 +110,7 @@ public static function runRoute($command, $params = null, $path = '', $namespace
 				$controllerFile = realpath($path . $parts[0] . '/' . ($segments[0]).'.php');
 
 			if(!file_exists($controllerFile))
-				return self::exception($segments[0] . ' Controller File is not found. Please, check file.');
+				return $this->exception($segments[0] . ' Controller File is not found. Please, check file.');
 
 			require_once($controllerFile);
 			$controller = new $segments[0]();
@@ -98,7 +120,7 @@ public static function runRoute($command, $params = null, $path = '', $namespace
 			elseif(is_null($params) && in_array($segments[1], get_class_methods($controller)))
 				echo call_user_func([$controller, $segments[1]]);
 			else
-        return self::exception($segments[1] . ' method is not found in '.$segments[0].' controller. Please, check file.');
+        return $this->exception($segments[1] . ' method is not found in '.$segments[0].' controller. Please, check file.');
 		}
 		else
 			if(!is_null($params))