From 1332ef713956415c6ee93edb47d5f7bb4e0151c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Tue, 5 Jan 2016 04:52:12 +0100 Subject: [PATCH] [TASK] Optimised regex for matching parameters. --- src/Pecee/SimpleRouter/RouterEntry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pecee/SimpleRouter/RouterEntry.php b/src/Pecee/SimpleRouter/RouterEntry.php index 0372166..435324b 100644 --- a/src/Pecee/SimpleRouter/RouterEntry.php +++ b/src/Pecee/SimpleRouter/RouterEntry.php @@ -278,10 +278,10 @@ abstract class RouterEntry { if($lastCharacter === '?') { $parameter = substr($parameter, 0, strlen($parameter)-1); - $regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>[^\/]*)))\\/{0,1}'; + $regex .= '\\/?(?P<'.$parameter.'>[^\/]*)\\/?'; $required = false; } else { - $regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/{0,1})'; + $regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/'; } $parameterNames[] = array('name' => $parameter, 'required' => $required); $parameter = '';