[TASK] Readded group match inheritence .

- Settings on routes now have higher priority when merging settings from
  group.
This commit is contained in:
Simon Sessingø
2016-03-18 17:43:57 +01:00
parent 6d8e95fcaa
commit 5483ffe458
2 changed files with 13 additions and 5 deletions
+12
View File
@@ -154,4 +154,16 @@ class Request {
return $this->loadedRoute; 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();
}
} }
+1 -5
View File
@@ -192,10 +192,6 @@ abstract class RouterEntry {
unset($settings['prefix']); unset($settings['prefix']);
} }
if(isset($settings['regexMatch'])) {
unset($settings['regexMatch']);
}
return $settings; return $settings;
} }
@@ -205,7 +201,7 @@ abstract class RouterEntry {
*/ */
public function addSettings(array $settings = null) { public function addSettings(array $settings = null) {
if(is_array($settings)) { if(is_array($settings)) {
$this->settings = array_merge($this->settings, $settings); $this->settings = array_merge($settings, $this->settings);
} }
return $this; return $this;
} }