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/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;
     }