Fixed prefix group merging issue in the route collection's class

divineniiquaye · Oct 10, 2022 · 4153a4f · 4153a4f
1 parent cddc624
commit 4153a4f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/RouteCollection.php b/src/RouteCollection.php
@@ -225,7 +225,7 @@ public function populate(self $collection, bool $asGroup = false)
                 $this->add($route['path'], [], $route['handler']);
                 $this->routes[$this->defaultIndex] = \array_merge_recursive(
                     $this->routes[$this->defaultIndex],
-                    \array_diff_key($route, ['path' => null, 'handler' => null])
+                    \array_diff_key($route, ['path' => null, 'handler' => null, 'prefix' => null])
                 );
             }
             $this->asRoute = $asRoute;

diff --git a/tests/RouteCollectionTest.php b/tests/RouteCollectionTest.php
@@ -660,6 +660,16 @@
                 'web' => true,
             ],
         ],
+        [
+            'handler' => 'Home::ping',
+            'prefix' => '/api/ping',
+            'path' => '/api/ping',
+            'methods' => [
+                'GET' => true,
+                'HEAD' => true,
+            ],
+            'name' => 'api.ping',
+        ],
         [
             'handler' => 'Home::createProduct',
             'prefix' => '/api/v1/product/create',
@@ -692,30 +702,14 @@
         ],
         [
             'handler' => 'Home::indexApi',
-            'prefix' => [
-                '/api',
-                null,
-            ],
+            'prefix' => '/api',
             'path' => '/api/',
             'methods' => [
                 'GET' => true,
                 'HEAD' => true,
             ],
             'name' => 'api.GET_HEAD_api_',
         ],
-        [
-            'handler' => 'Home::ping',
-            'prefix' => [
-                '/api/ping',
-                '/ping',
-            ],
-            'path' => '/api/ping',
-            'methods' => [
-                'GET' => true,
-                'HEAD' => true,
-            ],
-            'name' => 'api.ping',
-        ],
         [
             'handler' => 'Home::productUpdate',
             'prefix' => '/api/v1/product/update',