From 714edf7902acbfe72035c83e000ff21bc3e5fcea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Fri, 15 Jan 2016 10:20:50 +0100
Subject: [PATCH] [OPTIMISATION] Parameters matching optimisations.

---
 src/Pecee/SimpleRouter/RouterEntry.php    | 4 ++--
 src/Pecee/SimpleRouter/RouterResource.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Pecee/SimpleRouter/RouterEntry.php b/src/Pecee/SimpleRouter/RouterEntry.php
index 30b37c6..2f59b7c 100644
--- a/src/Pecee/SimpleRouter/RouterEntry.php
+++ b/src/Pecee/SimpleRouter/RouterEntry.php
@@ -238,7 +238,7 @@ abstract class RouterEntry {
         return new $name();
     }
 
-    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]*?') {
+    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+?') {
         $parameterNames = array();
         $regex = '';
         $lastCharacter = '';
@@ -274,7 +274,7 @@ abstract class RouterEntry {
 
                 if($lastCharacter === '?') {
                     $parameter = substr($parameter, 0, strlen($parameter)-1);
-                    $regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]*)?\\/?)';
+                    $regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]+)?\\/?)';
                     $required = false;
                 } else {
                     $regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
diff --git a/src/Pecee/SimpleRouter/RouterResource.php b/src/Pecee/SimpleRouter/RouterResource.php
index a9733e6..4b60e83 100644
--- a/src/Pecee/SimpleRouter/RouterResource.php
+++ b/src/Pecee/SimpleRouter/RouterResource.php
@@ -51,7 +51,7 @@ class RouterResource extends RouterEntry {
 
         $route = rtrim($this->url, '/') . '/{id?}/{action?}';
 
-        $parameters = $this->parseParameters($route, $url, '[0-9]*?');
+        $parameters = $this->parseParameters($route, $url, '[0-9]+?');
 
         if($parameters !== null) {