From d1f33d9b01251feaef085b7b74b1a69ce3232a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sat, 19 Nov 2016 06:01:53 +0100 Subject: [PATCH] Small optimisation --- src/Pecee/SimpleRouter/RouterBase.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php index 5b38ec6..ad40fcc 100644 --- a/src/Pecee/SimpleRouter/RouterBase.php +++ b/src/Pecee/SimpleRouter/RouterBase.php @@ -137,6 +137,7 @@ class RouterBase protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), RouterEntry $parent = null) { $mergedSettings = []; + $mergedPrefixes = []; // Loop through each route-request /* @var $route RouterEntry */ @@ -146,6 +147,7 @@ class RouterBase if ($parent !== null) { $route->setParent($parent); + $mergedPrefixes = []; } if ($route instanceof ILoadableRoute) { @@ -159,7 +161,7 @@ class RouterBase } elseif ($route instanceof RouterGroup) { if ($route->getPrefix() !== null && trim($route->getPrefix(), '/') !== '') { - $prefixes[] = trim($route->getPrefix(), '/'); + $mergedPrefixes[] = trim($route->getPrefix(), '/'); } if ($route->getCallback() !== null && is_callable($route->getCallback())) { @@ -186,7 +188,7 @@ class RouterBase $this->backStack = array(); // Route any routes added to the backstack - $this->processRoutes($backStack, $mergedSettings, $prefixes, $route); + $this->processRoutes($backStack, $mergedSettings, $mergedPrefixes, $route); } } }