Optimisations + bugfixes

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -22,7 +22,12 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 	public function loadMiddleware(Request $request, ILoadableRoute &$route)
 	{
 		if (count($this->getMiddlewares()) > 0) {
-			foreach ($this->getMiddlewares() as $middleware) {
+
+			$max = count($this->getMiddlewares());
+
+			for ($i = 0; $i < $max; $i++) {
+
+				$middleware = $this->getMiddlewares()[$i];
 
 				$middleware = $this->loadClass($middleware);
 				if (!($middleware instanceof IMiddleware)) {
@@ -46,9 +51,13 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 		$regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
 		if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
-			foreach ($matches[1] as $key) {
-				$this->parameters[$key] = null;
+
+			$max = count($matches[1]);
+
+			for($i = 0; $i < $max; $i++) {
+				$this->parameters[$matches[1][$i]] = null;
 			}
+
 		}
 
 		return $this;
@@ -92,7 +101,14 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 		$param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];
 
 		/* Let's parse the values of any {} parameter in the url */
-		foreach ($params as $param => $value) {
+
+		$max = count($params);
+		$keys = array_keys($params);
+
+		for ($i = 0; $i < $max; $i++) {
+			$param = $keys[$i];
+			$value = $params[$param];
+
 			$value = (isset($parameters[$param])) ? $parameters[$param] : $value;
 
 			if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {

src/Pecee/SimpleRouter/Route/Route.php

@@ -129,7 +129,12 @@ abstract class Route implements IRoute
 
 			$parameters = [];
 
-			foreach ($parameterNames as $name) {
+			$max = count($parameterNames);
+
+			for ($i = 0; $i < $max; $i++) {
+
+				$name = $parameterNames[$i];
+
 				$parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
 
 				if ($name['required'] && $parameterValue === null) {

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -107,7 +107,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
 			$action = isset($parameters['action']) ? $parameters['action'] : null;
 			unset($parameters['action']);
 
-			$method = request()->getMethod();
+			$method = $request->getMethod();
 
 			// Delete
 			if (isset($parameters['id']) && $method === static::REQUEST_TYPE_DELETE) {

src/Pecee/SimpleRouter/Router.php

@@ -208,8 +208,14 @@ class Router
 
 			/* Initialize boot-managers */
 			if (count($this->bootManagers) > 0) {
+
+				$max = count($this->bootManagers) - 1;
+
 				/* @var $manager IRouterBootManager */
-				foreach ($this->bootManagers as $manager) {
+				for ($i = 0; $i < $max; $i++) {
+
+					$manager = $this->bootManagers[$i];
+
 					$this->request = $manager->boot($this->request);
 
 					if (!($this->request instanceof Request)) {
@@ -232,8 +238,12 @@ class Router
 				$this->originalUrl = $this->request->getUri();
 			}
 
+			$max = count($this->processedRoutes);
+
 			/* @var $route IRoute */
-			foreach ($this->processedRoutes as $route) {
+			for ($i = 0; $i < $max; $i++) {
+
+				$route = $this->processedRoutes[$i];
 
 				/* If the route matches */
 				if ($route->matchRoute($this->request)) {
@@ -279,8 +289,12 @@ class Router
 
 	protected function handleException(\Exception $e)
 	{
+		$max = count($this->exceptionHandlers);
+
 		/* @var $handler IExceptionHandler */
-		foreach ($this->exceptionHandlers as $handler) {
+		for ($i = 0; $i < $max; $i++) {
+
+			$handler = $this->exceptionHandlers[$i];
 
 			$handler = new $handler();
 
@@ -327,8 +341,12 @@ class Router
 	 */
 	public function findRoute($name)
 	{
+		$max = count($this->processedRoutes);
+
 		/* @var $route ILoadableRoute */
-		foreach ($this->processedRoutes as $route) {
+		for ($i = 0; $i < $max; $i++) {
+
+			$route = $this->processedRoutes[$i];
 
 			/* Check if the name matches with a name on the route. Should match either router alias or controller alias. */
 			if ($route->hasName($name)) {
@@ -421,8 +439,12 @@ class Router
 
 			/* Loop through all the routes to see if we can find a match */
 
+			$max = count($this->processedRoutes);
+
 			/* @var $route ILoadableRoute */
-			foreach ($this->processedRoutes as $route) {
+			for ($i = 0; $i < $max; $i++) {
+
+				$route = $this->processedRoutes[$i];
 
 				/* Check if the route contains the name/alias */
 				if ($route->hasName($controller)) {