Merge pull request #38 from skipperbent/development

Development

src/Pecee/SimpleRouter/RouterRoute.php

@@ -6,7 +6,7 @@ use Pecee\Http\Request;
 
 class RouterRoute extends RouterEntry {
 
-    const PARAMETERS_REGEX_MATCH = '{([A-Za-z\-\_]*?)}';
+    const PARAMETERS_REGEX_MATCH = '{([A-Za-z\-\_]*?\?{0,1})}';
 
     protected $url;
 
@@ -26,8 +26,8 @@ class RouterRoute extends RouterEntry {
         // Match on custom defined regular expression
         if($this->regexMatch) {
             $parameters = array();
-            if(preg_match('/'.$this->regexMatch.'/is', $url, $parameters)) {
-                $this->parameters = $parameters[0];
+            if(preg_match('/('.$this->regexMatch.')/is', $url, $parameters)) {
+                $this->parameters = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
                 return $this;
             }
         }
@@ -60,21 +60,23 @@ class RouterRoute extends RouterEntry {
 
                 $isParameter = true;
             } elseif($isParameter && $character === '}') {
+                $required = false;
                 // 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}\\/)';
+                    $required = true;
                 } 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;
+                $parameterNames[] = array('value' => $parameter, 'required' => $required);
                 $parameter = '';
                 $isParameter = false;
 
@@ -97,7 +99,13 @@ class RouterRoute extends RouterEntry {
 
             if(count($parameterNames)) {
                 foreach($parameterNames as $name) {
-                    $parameters[$name] = isset($parameterValues[$name]) ? $parameterValues[$name] : null;
+                    $parameterValue = (isset($parameterValues[$name['value']]) && !empty($parameterValues[$name['value']])) ? $parameterValues[$name['value']] : null;
+
+                    if($name['required'] && $parameterValue === null) {
+                        throw new RouterException('Missing required parameter ' . $name['name'], 404);
+                    }
+
+                    $parameters[$name] = $parameterValue;
                 }
             }