fix RouteGroup register methods

effectra · Aug 21, 2023 · edf7ba1 · edf7ba1
1 parent eed1287
commit edf7ba1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/Register.php b/src/Register.php
@@ -60,7 +60,7 @@ public function routeId($method, $pattern)
      * @param string $route The route to correct.
      * @return string The corrected route.
      */
-    private function correctRoute(string $route): string
+    public function correctRoute(string $route): string
     {
         return $route = str_replace(['//', '\\', '///'], '/', $route);
     }

diff --git a/src/RouteGroup.php b/src/RouteGroup.php
@@ -33,7 +33,8 @@ public function __construct(
      */
     public function get(string $pattern, string $method): void
     {
-        $this->router->get($this->prePath . $pattern, [$this->controller, $method]);
+        $newPattern = $this->router->correctRoute($this->prePath . $pattern);
+        $this->router->get($newPattern, [$this->controller, $method]);
     }
 
     /**
@@ -45,7 +46,8 @@ public function get(string $pattern, string $method): void
      */
     public function post(string $pattern, string $method): void
     {
-        $this->router->post($this->prePath . $pattern, [$this->controller, $method]);
+        $newPattern = $this->router->correctRoute($this->prePath . $pattern);
+        $this->router->post($newPattern, [$this->controller, $method]);
     }
 
     /**
@@ -57,7 +59,8 @@ public function post(string $pattern, string $method): void
      */
     public function put(string $pattern, string $method): void
     {
-        $this->router->put($this->prePath . $pattern, [$this->controller, $method]);
+        $newPattern = $this->router->correctRoute($this->prePath . $pattern);
+        $this->router->put($newPattern, [$this->controller, $method]);
     }
 
     /**
@@ -69,7 +72,8 @@ public function put(string $pattern, string $method): void
      */
     public function delete(string $pattern, string $method): void
     {
-        $this->router->delete($this->prePath . $pattern, [$this->controller, $method]);
+        $newPattern = $this->router->correctRoute($this->prePath . $pattern);
+        $this->router->delete($newPattern, [$this->controller, $method]);
     }
 
     /**
@@ -81,7 +85,8 @@ public function delete(string $pattern, string $method): void
      */
     public function patch(string $pattern, string $method): void
     {
-        $this->router->patch($this->prePath . $pattern, [$this->controller, $method]);
+        $newPattern = $this->router->correctRoute($this->prePath . $pattern);
+        $this->router->patch($newPattern, [$this->controller, $method]);
     }
 
     /**
@@ -93,7 +98,8 @@ public function patch(string $pattern, string $method): void
      */
     public function options(string $pattern, string $method): void
     {
-        $this->router->options($this->prePath . $pattern, [$this->controller, $method]);
+        $newPattern = $this->router->correctRoute($this->prePath . $pattern);
+        $this->router->options($newPattern, [$this->controller, $method]);
     }
 
     /**
@@ -105,6 +111,7 @@ public function options(string $pattern, string $method): void
      */
     public function any(string $pattern, string $method): void
     {
-        $this->router->any($this->prePath . $pattern, [$this->controller, $method]);
+        $newPattern = $this->router->correctRoute($this->prePath . $pattern);
+        $this->router->any($newPattern, [$this->controller, $method]);
     }
 }