Merge pull request #73 from skipperbent/development

Development

src/Pecee/Http/Request.php

@@ -154,4 +154,16 @@ class Request {
         return $this->loadedRoute;
     }
 
+    public function isFormatAccepted($format) {
+        return (isset($_SERVER['HTTP_ACCEPT']) && stripos($_SERVER['HTTP_ACCEPT'], $format) > -1);
+    }
+
+    public function getAcceptFormats() {
+        if(isset($_SERVER['HTTP_ACCEPT'])) {
+            return explode(',', $_SERVER['HTTP_ACCEPT']);
+        }
+
+        return array();
+    }
+
 }

src/Pecee/SimpleRouter/RouterBase.php

@@ -86,7 +86,7 @@ class RouterBase {
 
             $this->currentRoute = $route;
 
-            if($route instanceof RouterGroup && is_callable($route->getCallback())) {
+            if($route instanceof RouterGroup && $route->matchRoute($this->request) && is_callable($route->getCallback())) {
                 $group = $route;
                 $route->renderRoute($this->request);
                 $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
@@ -126,12 +126,6 @@ class RouterBase {
 
             $route = $this->controllerUrlMap[$i];
 
-            if($route->getGroup() !== null) {
-                if($route->getGroup()->matchDomain($this->request) === false) {
-                    continue;
-                }
-            }
-
             $routeMatch = $route->matchRoute($this->request);
 
             if($routeMatch) {

src/Pecee/SimpleRouter/RouterEntry.php

@@ -201,7 +201,7 @@ abstract class RouterEntry {
      */
     public function addSettings(array $settings = null) {
         if(is_array($settings)) {
-            $this->settings = array_merge($this->settings, $settings);
+            $this->settings = array_merge($settings, $this->settings);
         }
         return $this;
     }

src/Pecee/SimpleRouter/RouterGroup.php

@@ -66,7 +66,12 @@ class RouterGroup extends RouterEntry {
     }
 
     public function matchRoute(Request $request) {
-        return null;
+        // Skip if prefix doesn't match
+        if($this->getPrefix() !== null && stripos($request->getUri(), $this->getPrefix()) === false) {
+            return false;
+        }
+
+        return $this->matchDomain($request);
     }
 
     public function setExceptionHandler($class) {