From a9e7a33ff83dcc503fda8d1c370a2b9c3952dbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sun, 22 Nov 2015 19:47:11 +0100 Subject: [PATCH] [...] Stuff from previous commit --- src/Pecee/SimpleRouter/RouterRoute.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Pecee/SimpleRouter/RouterRoute.php b/src/Pecee/SimpleRouter/RouterRoute.php index 44d1acb..4b7cf98 100644 --- a/src/Pecee/SimpleRouter/RouterRoute.php +++ b/src/Pecee/SimpleRouter/RouterRoute.php @@ -76,7 +76,7 @@ class RouterRoute extends RouterEntry { $regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/)'; } - $parameterNames[] = array('value' => $parameter, 'required' => $required); + $parameterNames[] = array('name' => $parameter, 'required' => $required); $parameter = ''; $isParameter = false; @@ -99,13 +99,13 @@ class RouterRoute extends RouterEntry { if(count($parameterNames)) { foreach($parameterNames as $name) { - $parameterValue = (isset($parameterValues[$name['value']]) && !empty($parameterValues[$name['value']])) ? $parameterValues[$name['value']] : null; + $parameterValue = (isset($parameterValues[$name['name']]) && !empty($parameterValues[$name['name']])) ? $parameterValues[$name['name']] : null; if($name['required'] && $parameterValue === null) { throw new RouterException('Missing required parameter ' . $name['name'], 404); } - $parameters[$name] = $parameterValue; + $parameters[$name['name']] = $parameterValue; } }