Updated Router and RouterCommand classes.

Author: izniburak

src/Router.php

@@ -405,9 +405,18 @@ private function addRoute($uri, $method, $callback, $settings)
           $group .= $value['route'];
 
 		$page = dirname($_SERVER['PHP_SELF']);
-    $route = rtrim($page . $group . '/' . trim($uri, '/'), '/');
+		$page = $page == '/' ? '' : $page;
 
-    if($route == $page)
+		if(strstr($page, 'index.php'))
+		{
+			$data = implode('/', explode('/', $page));
+			$page = str_replace($data, '', $page);
+		}
+
+    $route = $page . $group . '/' . trim($uri, '/');
+		$route = rtrim($route, '/');
+
+		if($route == $page)
       $route .= '/';
 
     $data = [
@@ -453,19 +462,19 @@ private function runRouteCommand($command, $params = null)
   */
   public function runRouteMiddleware($middleware, $type)
   {
-    if($type == 'before')
+		if($type == 'before')
     {
       if(!is_null($middleware['group']))
-        RouterCommand::beforeAfter($middleware['group'][$type], $this->middlewares);
+        RouterCommand::beforeAfter($middleware['group'][$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
 
-      RouterCommand::beforeAfter($middleware[$type], $this->middlewares);
+      RouterCommand::beforeAfter($middleware[$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
     }
     else
     {
-      RouterCommand::beforeAfter($middleware[$type], $this->middlewares);
+      RouterCommand::beforeAfter($middleware[$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
 
       if(!is_null($middleware['group']))
-        RouterCommand::beforeAfter($middleware['group'][$type], $this->middlewares);
+        RouterCommand::beforeAfter($middleware['group'][$type], $this->middlewares, $this->paths['middlewares'], $this->namespaces['middlewares']);
     }
   }
 

src/Router/RouterCommand.php

@@ -48,7 +48,7 @@ public static function beforeAfter($command, $middleware, $path = '', $namespace
 				$controller = new $segments[0]();
 
 				if(in_array($segments[1], get_class_methods($controller)))
-					return $controller->$segments[1]();
+					return call_user_func([$controller, $segments[1]]);
 				else
           return new RouterException($segments[1] . ' method is not found in <b>'.$segments[0].'</b> middleware. Please, check file.');
 			}