From 72dd5199bd590a194b877a5104d44ed5717af3ed Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 2 Apr 2017 20:34:42 +0200 Subject: [PATCH] multi optional --- AltoRouter.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/AltoRouter.php b/AltoRouter.php index fe0aaac..8b3f631 100644 --- a/AltoRouter.php +++ b/AltoRouter.php @@ -254,14 +254,18 @@ class AltoRouter { $pre = '\.'; } + $optional = $optional !== '' ? '?' : null; + //Older versions of PCRE require the 'P' in (?P) $pattern = '(?:' . ($pre !== '' ? $pre : null) . '(' . ($param !== '' ? "?P<$param>" : null) . $type - . '))' - . ($optional !== '' ? '?' : null); + . ')' + . $optional + . ')' + . $optional; $route = str_replace($block, $pattern, $route); }