Merge pull request #37 from skipperbent/development

Fixed route not matching when two params added next to each other.

src/Pecee/SimpleRouter/RouterRoute.php

@@ -63,16 +63,16 @@ class RouterRoute extends RouterEntry {
                 // Check for optional parameter
                 if($lastCharacter === '?') {
                     $parameter = substr($parameter, 0, strlen($parameter)-1);
-                    $regex .= '(?:(?:\/(?P<'.$parameter.'>[0-9]*?)){0,1}\\/)';
+                    $regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>[a-z0-9]*?)){0,1}\\/)';
                 } else {
                     // Use custom parameter regex if it exists
-                    $parameterRegex = '[0-9]*?';
+                    $parameterRegex = '[a-z0-9]*?';
 
                     if(is_array($this->parametersRegex) && isset($this->parametersRegex[$parameter])) {
                         $parameterRegex = $this->parametersRegex[$parameter];
                     }
 
-                    $regex .= '(?:\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/)';
+                    $regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/)';
                 }
                 $parameterNames[] = $parameter;
                 $parameter = '';