Merge pull request #3 from MrF0o/development

Development

Author: MrF0o

README.md

@@ -1,7 +1,4 @@
 # php-router
-
-(WORK IN PROGRESS)
-
 This router is designed to help you easily and efficiently handle HTTP requests and responses in your PHP applications. It is inspired by the popular Laravel framework, and aims to provide a similar experience and functionality.
 
 # Getting Started

composer.json

@@ -20,7 +20,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "9.6.x-dev"

src/Router.php

@@ -64,7 +64,7 @@ public static function init()
     public static function run()
     {
         self::init();
-        $user_uri = $_SERVER['REQUEST_URI'];
+        $user_uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
         $user_method = $_SERVER['REQUEST_METHOD'];
         $route = self::$routeList->search(new URI($user_uri));
 
@@ -119,20 +119,27 @@ private function performTests($route, $uri, $user_method)
 
     public static function group(array $options, $callback): void
     {
+        self::init();
         self::$isTrackingGroup = true;
 
-        if (isset($options['prefix'])) {
-            $_p = $options['prefix'];
-            call_user_func($callback);
+        if ($options && count($options) > 0) {
+            $_p = $options['prefix'] ?? false;
+            $_m = $options['middleware'] ?? false;
+            
+            if ($callback) {
+                call_user_func($callback);
+            }
 
             // now $tmpGroup have each grouped route
-            // 1. apply prefix
-            self::$tmpGroup->forEach(function (Route $route) use ($_p) {
-                $route->applyPrefix($_p);
+            self::$tmpGroup->forEach(function (Route $route) use ($_p, $_m) {
+                // 1. apply prefix
+                if ($_p)
+                    $route->applyPrefix($_p);
+                // 2. apply middlewares
+                if ($_m)
+                    $route->middleware($_m);
             });
 
-            // 2. apply middlewares
-            // TODO
         }
 
         self::$routeList->mergeAtTail(self::$tmpGroup);
@@ -205,4 +212,4 @@ public static function generateURL($routeName, ...$params): string
             return die("No route with name '$routeName'");
         }
     }
-}
+}