From 1bafbab56b7f07d4849d6abd6497aa1e792c1610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sat, 19 Mar 2016 16:27:25 +0100
Subject: [PATCH] [TASK] Moved RouterException. Readded lost stuff from
 Request.

---
 .../RouterException.php                          |  2 +-
 src/Pecee/Http/Request.php                       | 16 +++++++++++-----
 src/Pecee/SimpleRouter/RouterBase.php            |  3 ++-
 src/Pecee/SimpleRouter/RouterController.php      |  1 +
 src/Pecee/SimpleRouter/RouterEntry.php           |  1 +
 src/Pecee/SimpleRouter/RouterGroup.php           |  1 +
 src/Pecee/SimpleRouter/RouterResource.php        |  1 +
 7 files changed, 18 insertions(+), 7 deletions(-)
 rename src/Pecee/{SimpleRouter => Exception}/RouterException.php (62%)

diff --git a/src/Pecee/SimpleRouter/RouterException.php b/src/Pecee/Exception/RouterException.php
similarity index 62%
rename from src/Pecee/SimpleRouter/RouterException.php
rename to src/Pecee/Exception/RouterException.php
index c8ca241..5432c66 100644
--- a/src/Pecee/SimpleRouter/RouterException.php
+++ b/src/Pecee/Exception/RouterException.php
@@ -1,3 +1,3 @@
 <?php
-namespace Pecee\SimpleRouter;
+namespace Pecee\Exception;
 class RouterException extends \Exception { }
\ No newline at end of file
diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index 7f1e8ca..69a3021 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -6,11 +6,6 @@ class Request {
     protected static $instance;
 
     protected $data;
-    protected $uri;
-    protected $host;
-    protected $method;
-    protected $headers;
-    protected $loadedRoute;
 
     /**
      * Return new instance
@@ -136,6 +131,17 @@ class Request {
         return (isset($_REQUEST[$name]) ? $_REQUEST[$name] : $defaultValue);
     }
 
+    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();
+    }
+
     public function __set($name, $value = null) {
         $this->data[$name] = $value;
     }
diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php
index 1dd6400..926d648 100644
--- a/src/Pecee/SimpleRouter/RouterBase.php
+++ b/src/Pecee/SimpleRouter/RouterBase.php
@@ -2,6 +2,7 @@
 namespace Pecee\SimpleRouter;
 
 use Pecee\CsrfToken;
+use Pecee\Exception\RouterException;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
 
@@ -18,7 +19,7 @@ class RouterBase {
     protected $defaultNamespace;
     protected $bootManagers;
     protected $baseCsrfVerifier;
-    
+
     // TODO: clean up - cut some of the methods down to smaller pieces
 
     public function __construct() {
diff --git a/src/Pecee/SimpleRouter/RouterController.php b/src/Pecee/SimpleRouter/RouterController.php
index b05db29..14230b5 100644
--- a/src/Pecee/SimpleRouter/RouterController.php
+++ b/src/Pecee/SimpleRouter/RouterController.php
@@ -1,6 +1,7 @@
 <?php
 namespace Pecee\SimpleRouter;
 
+use Pecee\Exception\RouterException;
 use Pecee\Http\Request;
 
 class RouterController extends RouterEntry {
diff --git a/src/Pecee/SimpleRouter/RouterEntry.php b/src/Pecee/SimpleRouter/RouterEntry.php
index 45d3f00..e969350 100644
--- a/src/Pecee/SimpleRouter/RouterEntry.php
+++ b/src/Pecee/SimpleRouter/RouterEntry.php
@@ -2,6 +2,7 @@
 
 namespace Pecee\SimpleRouter;
 
+use Pecee\Exception\RouterException;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 
diff --git a/src/Pecee/SimpleRouter/RouterGroup.php b/src/Pecee/SimpleRouter/RouterGroup.php
index 739bf81..2283744 100644
--- a/src/Pecee/SimpleRouter/RouterGroup.php
+++ b/src/Pecee/SimpleRouter/RouterGroup.php
@@ -2,6 +2,7 @@
 
 namespace Pecee\SimpleRouter;
 
+use Pecee\Exception\RouterException;
 use Pecee\Http\Request;
 
 class RouterGroup extends RouterEntry {
diff --git a/src/Pecee/SimpleRouter/RouterResource.php b/src/Pecee/SimpleRouter/RouterResource.php
index 36598d8..e2c1920 100644
--- a/src/Pecee/SimpleRouter/RouterResource.php
+++ b/src/Pecee/SimpleRouter/RouterResource.php
@@ -1,6 +1,7 @@
 <?php
 namespace Pecee\SimpleRouter;
 
+use Pecee\Exception\RouterException;
 use Pecee\Http\Request;
 
 class RouterResource extends RouterEntry {