Development

- Isolated Http classes from router.
- Removed getInstance from Request object - current router request should now be obtained through SimpleRouter::request().
- Fixed broken test cases.
- Added test for regular expression match.
- Updated documentation to reflect changes.
- Added more helper examples to documentation.
- Added helpers to demo-project.
- Optimisations.

demo-project/app/Controllers/ApiController.php

@@ -1,7 +1,7 @@
 <?php
 namespace Demo\Controllers;
 
-use Pecee\Http\Request;
+use Pecee\SimpleRouter\SimpleRouter;
 
 class ApiController {
 
@@ -9,7 +9,7 @@ class ApiController {
 
         // The variable authenticated is set to true in the ApiVerification middleware class.
 
-        $request = Request::getInstance();
+        $request = SimpleRouter::request();
 
         header('content-type: application/json');
 

demo-project/app/Router.php

@@ -13,11 +13,13 @@ class Router extends SimpleRouter {
 
     public static function start($defaultNamespace = null) {
 
-        // change this to whatever makes sense in your project
+        // Load our helpers
+        require_once 'helpers.php';
+
+        // Load our custom routes
         require_once 'routes.php';
 
         // Do initial stuff
-
         parent::start('\\Demo\\Controllers');
 
     }

demo-project/app/helpers.php

@@ -0,0 +1,31 @@
+<?php
+use \Pecee\SimpleRouter\SimpleRouter;
+
+function url($controller, $parameters = null, $getParams = null) {
+    SimpleRouter::getRoute($controller, $parameters, $getParams);
+}
+
+/**
+ * Get current csrf-token
+ * @return null|string
+ */
+function csrf_token() {
+    $token = new \Pecee\CsrfToken();
+    return $token->getToken();
+}
+
+/**
+ * Get request object
+ * @return \Pecee\Http\Request
+ */
+function request() {
+    return SimpleRouter::request();
+}
+
+/**
+ * Get response object
+ * @return \Pecee\Http\Response
+ */
+function response() {
+    return SimpleRouter::response();
+}