From 5b86ad6067cef3f83cf16527e9e8022d3aa8d3d6 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 18 Jul 2011 22:49:25 -0500 Subject: [PATCH] trim route finder iterator instantiation. --- system/route/finder.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/system/route/finder.php b/system/route/finder.php index 60dce528..4e3ea030 100644 --- a/system/route/finder.php +++ b/system/route/finder.php @@ -42,7 +42,9 @@ class Finder { return static::$names[$name]; } - $recursiveIterator = new \RecursiveIteratorIterator($arrayIterator = new \RecursiveArrayIterator(static::$routes)); + $arrayIterator = new \RecursiveArrayIterator(static::$routes); + + $recursiveIterator = new \RecursiveIteratorIterator($arrayIterator); foreach ($recursiveIterator as $iterator) { @@ -67,9 +69,11 @@ class Finder { { $routes = array(); - $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(APP_PATH.'routes'), \RecursiveIteratorIterator::SELF_FIRST); + $directoryIterator = new \RecursiveDirectoryIterator(APP_PATH.'routes'); - foreach ($iterator as $file) + $recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST); + + foreach ($recursiveIterator as $file) { if (filetype($file) === 'file') {