Version 3

- Easier rewrite management.
- Optimisations.
- Updated documentation.

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

@@ -4,7 +4,6 @@ namespace Pecee\Http\Middleware;
 use Pecee\CsrfToken;
 use Pecee\Http\Middleware\Exceptions\TokenMismatchException;
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 class BaseCsrfVerifier implements IMiddleware
 {
@@ -55,7 +54,7 @@ class BaseCsrfVerifier implements IMiddleware
         return false;
     }
 
-    public function handle(Request $request, ILoadableRoute &$route = null)
+    public function handle(Request $request)
     {
 
         if ($this->skip($request) === false && in_array($request->getMethod(), ['post', 'put', 'delete'], false) === true) {

src/Pecee/Http/Middleware/IMiddleware.php

@@ -2,15 +2,13 @@
 namespace Pecee\Http\Middleware;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 interface IMiddleware
 {
     /**
      * @param Request $request
-     * @param ILoadableRoute $route
      * @return Request|null
      */
-    public function handle(Request $request, ILoadableRoute &$route);
+    public function handle(Request $request);
 
 }

src/Pecee/Http/Request.php

@@ -2,6 +2,9 @@
 namespace Pecee\Http;
 
 use Pecee\Http\Input\Input;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\IRoute;
+use Pecee\SimpleRouter\Route\RouteUrl;
 
 class Request
 {
@@ -12,6 +15,17 @@ class Request
     protected $method;
     protected $input;
 
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $rewriteRoute;
+    protected $rewriteUrl;
+
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $loadedRoute;
+
     public function __construct()
     {
         $this->parseHeaders();
@@ -213,6 +227,86 @@ class Request
         $this->method = $method;
     }
 
+    /**
+     * Set rewrite route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setRewriteRoute(ILoadableRoute $route)
+    {
+        $this->rewriteRoute = $route;
+
+        return $this;
+    }
+
+    /**
+     * Get rewrite route
+     *
+     * @return IRoute|null
+     */
+    public function getRewriteRoute()
+    {
+        return $this->rewriteRoute;
+    }
+
+    /**
+     * Get rewrite url
+     *
+     * @return string
+     */
+    public function getRewriteUrl()
+    {
+        return $this->rewriteUrl;
+    }
+
+    /**
+     * Set rewrite url
+     *
+     * @param string $rewriteUrl
+     * @return static
+     */
+    public function setRewriteUrl($rewriteUrl)
+    {
+        $this->rewriteUrl = $rewriteUrl;
+
+        return $this;
+    }
+
+    /**
+     * Set rewrite callback
+     * @param string $callback
+     * @return static
+     */
+    public function setRewriteCallback($callback)
+    {
+        $this->rewriteRoute = new RouteUrl($this->uri, $callback);
+
+        return $this;
+    }
+
+    /**
+     * Get loaded route
+     * @return ILoadableRoute|null
+     */
+    public function getLoadedRoute()
+    {
+        return $this->loadedRoute;
+    }
+
+    /**
+     * Set loaded route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setLoadedRoute(ILoadableRoute $route)
+    {
+        $this->loadedRoute = $route;
+
+        return $this;
+    }
+
     public function __isset($name)
     {
         return array_key_exists($name, $this->data);