Development

- Fixed updatae causing middlewares to sometimes load on wrong routes.
- Converted project to PSR/2.
- Updated InputCollection class and added get method for easy access to values.
- Complete refactor of RouterBase.
- Added findRoute method to RouterBase.
- It's now possible to change parameter modifiers and symbol by overwriting properties on RouterBase.
- Added RouterUrlTest unit-test for testing route-urls.
- Added IRestController that can be easily implemented in custom ResourceController-classes.
- It's now possible to use "-" instead of "_" when using getHeader method in Request class.
- Added PHPDocs.
- Fixed "/" route sometimes returning "//" as url.
- Optimisations and bugfixes.

demo-project/app/Controllers/ApiController.php

@@ -1,20 +1,16 @@
 <?php
 namespace Demo\Controllers;
 
-use Pecee\SimpleRouter\SimpleRouter;
+class ApiController
+{
+	public function index()
+	{
+		// The variable authenticated is set to true in the ApiVerification middleware class.
+		header('content-type: application/json');
 
-class ApiController {
-
-    public function index() {
-
-        // The variable authenticated is set to true in the ApiVerification middleware class.
-
-        header('content-type: application/json');
-
-        echo json_encode([
-            'authenticated' => request()->authenticated
-        ]);
-
-    }
+		echo json_encode([
+			'authenticated' => request()->authenticated
+		]);
+	}
 
 }

demo-project/app/Controllers/DefaultController.php

@@ -1,29 +1,27 @@
 <?php
 namespace Demo\Controllers;
 
-class DefaultController {
+class DefaultController
+{
+	public function index()
+	{
+		// implement
+		echo sprintf('DefaultController -> index (?fun=%s)', input()->get('fun'));
+	}
 
-    public function index() {
+	public function contact()
+	{
+		echo 'DefaultController -> contact';
+	}
 
-        // implement
-        echo sprintf('DefaultController -> index (?fun=%s)', input()->get('fun'));
+	public function companies($id = null)
+	{
+		echo 'DefaultController -> companies -> id: ' . $id;
+	}
 
-    }
-
-    public function contact() {
-
-        echo 'DefaultController -> contact';
-
-    }
-
-    public function companies($id = null) {
-
-        echo 'DefaultController -> companies -> id: ' . $id;
-
-    }
-
-    public function notFound() {
-        echo 'Page not found';
-    }
+	public function notFound()
+	{
+		echo 'Page not found';
+	}
 
 }

demo-project/app/Handlers/CustomExceptionHandler.php

@@ -5,30 +5,30 @@ use Pecee\Handler\IExceptionHandler;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\RouterEntry;
 
-class CustomExceptionHandler implements IExceptionHandler {
+class CustomExceptionHandler implements IExceptionHandler
+{
+	public function handleError(Request $request, RouterEntry &$route = null, \Exception $error)
+	{
+		// Return json errors if we encounter an error on /api.
+		if (stripos($request->getUri(), '/api') !== false) {
+			header('content-type: application/json');
+			echo json_encode([
+				'error' => $error->getMessage(),
+				'code' => $error->getCode()
+			]);
+			die();
+		}
 
-    public function handleError( Request $request, RouterEntry &$route = null, \Exception $error) {
+		// else we just throw the error
+		if ($error->getCode() == 404) {
 
-        // Return json errors if we encounter an error on /api.
-        if(stripos($request->getUri(), '/api') !== false) {
-            header('content-type: application/json');
-            echo json_encode([
-                'error' => $error->getMessage(),
-                'code' => $error->getCode()
-            ]);
-            die();
-        }
+			// Return 404 path
+			$request->setUri('/404');
+			return $request;
 
-        // else we just throw the error
-        if($error->getCode() == 404) {
+		}
 
-            // Return 404 path
-            $request->setUri('/404');
-            return $request;
-
-        }
-
-        throw $error;
-    }
+		throw $error;
+	}
 
 }

demo-project/app/Middlewares/ApiVerification.php

@@ -5,15 +5,14 @@ use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\RouterEntry;
 
-class ApiVerification implements IMiddleware {
+class ApiVerification implements IMiddleware
+{
+	public function handle(Request $request, RouterEntry &$route)
+	{
+		// Do authentication
+		$request->authenticated = true;
 
-    public function handle(Request $request, RouterEntry &$route) {
-
-        // Do authentication
-        $request->authenticated = true;
-
-        return $request;
-
-    }
+		return $request;
+	}
 
 }

demo-project/app/Middlewares/CsrfVerifier.php

@@ -3,11 +3,11 @@ namespace Demo\Middlewares;
 
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 
-class CsrfVerifier extends BaseCsrfVerifier {
-
-    /**
-     * CSRF validation will be ignored on the following urls.
-     */
-    protected $except = ['/api/*'];
+class CsrfVerifier extends BaseCsrfVerifier
+{
+	/**
+	 * CSRF validation will be ignored on the following urls.
+	 */
+	protected $except = ['/api/*'];
 
 }

demo-project/app/Router.php

@@ -1,29 +1,26 @@
 <?php
-
 /**
  * Custom router which handles default middlewares, default exceptions and things
  * that should be happen before and after the router is initialised.
  */
-
 namespace Demo;
 
 use Pecee\SimpleRouter\SimpleRouter;
 
-class Router extends SimpleRouter {
+class Router extends SimpleRouter
+{
+	public static function start($defaultNamespace = null)
+	{
+		// Load our helpers
+		require_once 'helpers.php';
 
-    public static function start($defaultNamespace = null) {
+		// Load our custom routes
+		require_once 'routes.php';
 
-        // Load our helpers
-        require_once 'helpers.php';
+		parent::setDefaultNamespace('\Demo');
 
-        // Load our custom routes
-        require_once 'routes.php';
-
-        parent::setDefaultNamespace('\Demo\Controllers');
-
-        // Do initial stuff
-        parent::start();
-
-    }
+		// Do initial stuff
+		parent::start();
+	}
 
 }

demo-project/app/helpers.php

@@ -1,39 +1,44 @@
 <?php
 use Pecee\SimpleRouter\SimpleRouter;
 
-function url($controller, $parameters = null, $getParams = null) {
-    SimpleRouter::getRoute($controller, $parameters, $getParams);
+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();
+function csrf_token()
+{
+	$token = new \Pecee\CsrfToken();
+	return $token->getToken();
 }
 
 /**
  * Get request object
  * @return \Pecee\Http\Request
  */
-function request() {
-    return SimpleRouter::request();
+function request()
+{
+	return SimpleRouter::request();
 }
 
 /**
  * Get response object
  * @return \Pecee\Http\Response
  */
-function response() {
-    return SimpleRouter::response();
+function response()
+{
+	return SimpleRouter::response();
 }
 
 /**
  * Get input class
  * @return \Pecee\Http\Input\Input
  */
-function input() {
-    return SimpleRouter::request()->getInput();
+function input()
+{
+	return SimpleRouter::request()->getInput();
 }

demo-project/app/routes.php

@@ -7,17 +7,17 @@ use Demo\Router;
 
 Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
 
-Router::group(['exceptionHandler' => 'Demo\Handlers\CustomExceptionHandler'], function() {
+Router::group(['exceptionHandler' => 'Demo\Handlers\CustomExceptionHandler'], function () {
 
-    Router::get('/', 'DefaultController@index')->setAlias('home');
-    Router::get('/contact', 'DefaultController@contact')->setAlias('contact');
-    Router::get('/404', 'DefaultController@notFound')->setAlias('404');
-    Router::basic('/companies', 'DefaultController@companies')->setAlias('companies');
-    Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('companies');
+	Router::get('/', 'DefaultController@index')->setAlias('home');
+	Router::get('/contact', 'DefaultController@contact')->setAlias('contact');
+	Router::get('/404', 'DefaultController@notFound')->setAlias('404');
+	Router::basic('/companies', 'DefaultController@companies')->setAlias('companies');
+	Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('companies');
 
-    // Api
-    Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function() {
-        Router::resource('/demo', 'ApiController');
-    });
+	// Api
+	Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function () {
+		Router::resource('/demo', 'ApiController');
+	});
 
 });