#372 - Regex improvements

- Add 'id' type - Do not use a match group for 'slug' type
joomlatools · Jun 18, 2020 · 01b7f8d · 01b7f8d
1 parent 50a41c6
commit 01b7f8d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/code/site/components/com_pages/dispatcher/router/resolver/regex.php b/code/site/components/com_pages/dispatcher/router/resolver/regex.php
@@ -77,7 +77,8 @@ protected function _initialize(KObjectConfig $config)
                 '*alnum' => '[0-9A-Za-z]+(,[0-9A-Za-z]+)*',
                 'alpha'  => '[A-Za-z]++',
                 '*alpha' => '[A-Za-z]+(,[A-Za-z]+)*',
-                'slug'   => '[0-9]++[-]++([0-9A-Za-z-]++)',
+                'id'     => '[0-9]++[-]++[0-9A-Za-z-]++',
+                'slug'   => '[^0-9-][a-z-0-9]++',
                 '*'      => '.+?',
                 '**'     => '.++',
                 ''       => '[^/\.]++',
@@ -351,8 +352,10 @@ protected function _buildRoute($regex, ComPagesDispatcherRouterRouteInterface $r
                         {
                             $type = $this->_match_types[$type];
 
-                            preg_match('/'.$type.'/', $value, $matches);
-                            $value = $matches[1] ?? $value;
+                            //Get first capturing group if it exists, if not use full match
+                            if(preg_match('/'.$type.'/', $value, $matches)) {
+                                $value = $matches[0] ?? $value;
+                            }
                         }
 
                         //Part is found, replace for param value