[BUGFIX] Bugfixes and optimisations

- Fixed support for multiple middlewares using array.
- Fixed match and parameters-match not not being merged when used on group.

src/Pecee/SimpleRouter/RouterBase.php

@@ -58,6 +58,7 @@ class RouterBase {
 
             $newPrefixes = $prefixes;
             $mergedSettings = array_merge($settings, $route->getMergeableSettings());
+
             if($route->getPrefix()) {
                 array_push($newPrefixes, rtrim($route->getPrefix(), '/'));
             }

src/Pecee/SimpleRouter/RouterEntry.php

@@ -22,14 +22,12 @@ abstract class RouterEntry {
     protected $settings;
     protected $callback;
     protected $parameters;
-    protected $parametersRegex;
-    protected $regexMatch;
 
     public function __construct() {
         $this->settings = array();
         $this->settings['requestMethods'] = array();
+        $this->settings['parametersRegex'] = array();
         $this->parameters = array();
-        $this->parametersRegex = array();
     }
 
     /**
@@ -245,13 +243,25 @@ abstract class RouterEntry {
 
     public function loadMiddleware(Request $request) {
         if($this->getMiddleware()) {
-            $middleware = $this->loadClass($this->getMiddleware());
+            if(is_array($this->getMiddleware())) {
-            if (!($middleware instanceof IMiddleware)) {
+                foreach($this->getMiddleware() as $middleware) {
-                throw new RouterException($this->getMiddleware() . ' must be instance of Middleware');
+                    $middleware = $this->loadClass($middleware);
-            }
+                    if (!($middleware instanceof IMiddleware)) {
+                        throw new RouterException($middleware . ' must be instance of Middleware');
+                    }
 
-            /* @var $class Middleware */
+                    /* @var $class Middleware */
-            $middleware->handle($request);
+                    $middleware->handle($request);
+                }
+            } else {
+                $middleware = $this->loadClass($this->getMiddleware());
+                if (!($middleware instanceof IMiddleware)) {
+                    throw new RouterException($this->getMiddleware() . ' must be instance of Middleware');
+                }
+
+                /* @var $class Middleware */
+                $middleware->handle($request);
+            }
         }
     }