Merge pull request #527 from skipperbent/v4-feature-group-parameters

[FEATURE] Added support for parameters in group prefix.

README.md

@@ -655,6 +655,16 @@ SimpleRouter::group(['prefix' => '/admin'], function () {
 });
 ```
 
+You can also use parameters in your groups:
+
+```php
+SimpleRouter::group(['prefix' => '/lang/{language}'], function ($language) {
+    SimpleRouter::get('/users', function ()    {
+        // Matches The "/admin/users" URL
+    });
+});
+```
+
 ## Partial groups
 
 Partial router groups has the same benefits as a normal group, but supports parameters and are only rendered once the url has matched.

src/Pecee/SimpleRouter/Route/Route.php

@@ -154,16 +154,21 @@ abstract class Route implements IRoute
 
             $groupParameters = $this->getGroup() !== null ? $this->getGroup()->getParameters() : [];
 
+            $lastParams = [];
+
             /* Only take matched parameters with name */
             foreach ((array)$parameters[1] as $name) {
 
                 // Ignore parent parameters
                 if(isset($groupParameters[$name]) === true) {
+                    $lastParams[$name] = $matches[$name];
                     continue;
                 }
 
                 $values[$name] = (isset($matches[$name]) === true && $matches[$name] !== '') ? $matches[$name] : null;
             }
+
+            $values = array_merge($values, $lastParams);
         }
 
         $this->originalParameters = $values;

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -7,6 +7,7 @@ use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 
 class RouteGroup extends Route implements IGroupRoute
 {
+    protected $urlRegex = '/^%s\/?/u';
     protected $prefix;
     protected $name;
     protected $domains = [];
@@ -55,16 +56,19 @@ class RouteGroup extends Route implements IGroupRoute
             return false;
         }
 
-        // Parse parameter
+        // Parse group prefix parameters
+        if(count($this->originalParameters) === 0) {
+            $this->parseParameters($this->prefix, $url);
+        }
 
-        $prefix = $this->prefix;
+        $parsedPrefix = $this->prefix;
 
         foreach ($this->getParameters() as $parameter => $value) {
-            $prefix = str_ireplace('{' . $parameter . '}', $value, $prefix);
+            $parsedPrefix = str_ireplace('{' . $parameter . '}', $value, $parsedPrefix);
         }
 
         /* Skip if prefix doesn't match */
-        if ($this->prefix !== null && stripos($url, $prefix) === false) {
+        if ($this->prefix !== null && stripos($url, $parsedPrefix) === false) {
             return false;
         }
 

src/Pecee/SimpleRouter/Route/RoutePartialGroup.php

@@ -6,14 +6,7 @@ use Pecee\Http\Request;
 
 class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
 {
-
-    /**
-     * RoutePartialGroup constructor.
-     */
-    public function __construct()
-    {
-        $this->urlRegex = '/^%s\/?/u';
-    }
+    protected $urlRegex = '/^%s\/?/u';
 
     /**
      * Method called to check if route matches

tests/Pecee/SimpleRouter/RouterUrlTest.php

@@ -271,4 +271,81 @@ class RouterUrlTest extends \PHPUnit\Framework\TestCase
         TestRouter::router()->reset();
     }
 
+    public function testGroupPrefix() {
+
+        $result = false;
+
+        TestRouter::group(['prefix' => '/lang/{lang}'], function () use(&$result) {
+
+            TestRouter::get('/test', function() use(&$result) {
+                $result = true;
+            });
+        });
+
+        TestRouter::debug('/lang/da/test');
+
+        $this->assertTrue($result);
+
+        // Test group prefix sub-route
+
+        $result = null;
+        $expectedResult = 28;
+
+        TestRouter::group(['prefix' => '/lang/{lang}'], function () use(&$result) {
+
+            TestRouter::get('/horse/{horseType}', function($horseType) use(&$result) {
+                $result = false;
+            });
+
+            TestRouter::get('/user/{userId}', function($userId) use(&$result) {
+                $result = $userId;
+            });
+        });
+
+        TestRouter::debug("/lang/da/user/$expectedResult");
+
+        $this->assertEquals($expectedResult, $result);
+
+    }
+
+    public function testPassParameter() {
+
+        $result = false;
+        $expectedLanguage = 'da';
+
+        TestRouter::group(['prefix' => '/lang/{lang}'], function ($language) use(&$result) {
+
+            TestRouter::get('/test', function($language) use(&$result) {
+                $result = $language;
+            });
+
+        });
+
+        TestRouter::debug("/lang/$expectedLanguage/test");
+
+        $this->assertEquals($expectedLanguage, $result);
+
+    }
+
+    public function testPassParameterDeep() {
+
+        $result = false;
+        $expectedLanguage = 'da';
+
+        TestRouter::group(['prefix' => '/lang/{lang}'], function ($language) use(&$result) {
+
+            TestRouter::group(['prefix' => '/admin'], function($language) use(&$result) {
+                TestRouter::get('/test', function($language) use(&$result) {
+                    $result = $language;
+                });
+            });
+
+        });
+
+        TestRouter::debug("/lang/$expectedLanguage/admin/test");
+
+        $this->assertEquals($expectedLanguage, $result);
+
+    }
+
 }