Fix AbstractRouter

Author: ZhukMax

.gitignore

@@ -3,5 +3,6 @@
 composer.phar
 composer.lock
 /vendor/
+/tests/
 *.lnk
 *.ini

README.md

@@ -21,7 +21,7 @@ require_once 'vendor/autoload.php';
 use ProjectName\API\Controllers\IndexController;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
-use Zhukmax\Router\Router;
+use Zhukmax\SimpleRouter\Router;
 
 /** Add Twig Template engine **/
 $loader = new FilesystemLoader(__DIR__ . '/src/views');

src/AbstractRouter.php

@@ -42,8 +42,9 @@ public function __construct(array $params)
     protected function routesFromArray(array $routesGroups)
     {
         foreach ($routesGroups as $key => $group) {
-            $method = isset($group[2]) ? $group[2] : 'json';
-            $this->$key(key($group), $group[0] . 'Controller', $group[1], $method);
+            foreach ($group as $path => $item) {
+                $this->$key($path, $item[0] . 'Controller', $item[1]);
+            }
         }
     }
 
@@ -128,10 +129,11 @@ private static final function routeToRegex(string $path): string
      * @return array
      * @throws \Exception
      */
-    private final function getActiveRoute()
+    private final function getActiveRoute(): array
     {
+        $requestPath = str_replace("?".$_SERVER["QUERY_STRING"], "", $_SERVER["REQUEST_URI"]);
         foreach ($this->routes as $path => $route) {
-            if (preg_match($path, $_SERVER["REDIRECT_URL"])) {
+            if (preg_match($path, $requestPath)) {
                 $activeRoute = $route;
                 break;
             }
@@ -142,7 +144,7 @@ private final function getActiveRoute()
         }
 
         if (!in_array(strtolower($_SERVER["REQUEST_METHOD"]), $activeRoute['method'])) {
-            throw new \Exception("Wrong HTTP method");
+            throw new \Exception("Wrong HTTP method: " . $activeRoute['method']);
         }
 
         return $activeRoute;