Merge pull request #630 from skipperbent/v5-development

Version 5.0.0.2
Fixed deprication warnings
2026-06-18 09:17:52 +00:00 · 2023-02-11 17:34:48 +01:00 · 2023-02-11 17:31:00 +01:00 · 2023-02-11 17:25:54 +01:00 · 2023-02-11 17:22:40 +01:00 · 2023-02-11 17:16:40 +01:00
44 changed files with 1159 additions and 242 deletions
@@ -17,10 +17,10 @@ jobs:
          - ubuntu-latest
          - windows-latest
        php-version:
-          - 7.1
          - 7.4
+          - 8.0
        phpunit-version:
-          - 7.5.20
+          - 8.5.32
        dependencies:
          - lowest
          - highest
@@ -48,6 +48,7 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 		- [Namespaces](#namespaces)
 		- [Subdomain-routing](#subdomain-routing)
 		- [Route prefixes](#route-prefixes)
+	- [Partial groups](#partial-groups)
 	- [Form Method Spoofing](#form-method-spoofing)
 	- [Accessing The Current Route](#accessing-the-current-route)
 	- [Other examples](#other-examples)
@@ -61,6 +62,7 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 - [ExceptionHandlers](#exceptionhandlers)
    - [Handling 404, 403 and other errors](#handling-404-403-and-other-errors)
 	- [Using custom exception handlers](#using-custom-exception-handlers)
+		- [Prevent merge of parent exception-handlers](#prevent-merge-of-parent-exception-handlers)
 - [Urls](#urls)
    - [Get the current url](#get-the-current-url)
 	- [Get by name (single route)](#get-by-name-single-route)
@@ -76,12 +78,15 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 	    - [Get parameter object](#get-parameter-object)
 	    - [Managing files](#managing-files)
 	    - [Get all parameters](#get-all-parameters)
+	    - [Check if parameters exists](#check-if-parameters-exists)
 - [Events](#events)
    - [Available events](#available-events)
    - [Registering new event](#registering-new-event)
    - [Custom EventHandlers](#custom-eventhandlers)
 - [Advanced](#advanced)
 	- [Disable multiple route rendering](#disable-multiple-route-rendering)
+	- [Restrict access to IP](#restrict-access-to-ip)
+	- [Setting custom base path](#setting-custom-base-path)
 	- [Url rewriting](#url-rewriting)
 		- [Changing current route](#changing-current-route)
 		- [Bootmanager: loading routes dynamically](#bootmanager-loading-routes-dynamically)
@@ -160,6 +165,8 @@ You can find the demo-project here: [https://github.com/skipperbent/simple-route
 - Sub-domain routing
 - Custom boot managers to rewrite urls to "nicer" ones.
 - Input manager; easily manage `GET`, `POST` and `FILE` values.
+- IP based restrictions.
+- Easily extendable.

 ## Installation

@@ -466,7 +473,8 @@ SimpleRouter::get('/posts/{post}/comments/{comment}', function ($postId, $commen
 });
 ```

-**Note:** Route parameters are always encased within {} braces and should consist of alphabetic characters. Route parameters may not contain a - character. Use an underscore (_) instead.
+**Note:** Route parameters are always encased within `{` `}` braces and should consist of alphabetic characters. Route parameters can only contain certain characters like `A-Z`, `a-z`, `0-9`, `-` and `_`.
+If your route contain other characters, please see  [Custom regex for matching parameters](#custom-regex-for-matching-parameters).

 ### Optional parameters

@@ -681,6 +689,27 @@ SimpleRouter::group(['prefix' => '/lang/{language}'], function ($language) {
 });
 ```

+## Partial groups
+
+Partial router groups has the same benefits as a normal group, but **are only rendered once the url has matched** 
+in contrast to a normal group which are always rendered in order to retrieve it's child routes.
+Partial groups are therefore more like a hybrid of a traditional route with the benefits of a group.
+
+This can be extremely useful in situations where you only want special routes to be added, but only when a certain criteria or logic has been met.
+
+**NOTE:** Use partial groups with caution as routes added within are only rendered and available once the url of the partial-group has matched. 
+This can cause `url()` not to find urls for the routes added within before the partial-group has been matched and is rendered.
+
+**Example:**
+
+```php
+SimpleRouter::partialGroup('/plugin/{name}', function ($plugin) {
+
+    // Add routes from plugin
+
+});
+```
+
 ## Form Method Spoofing

 HTML forms do not support `PUT`, `PATCH` or `DELETE` actions. So, when defining `PUT`, `PATCH` or `DELETE` routes that are called from an HTML form, you will need to add a hidden `_method` field to the form. The value sent with the `_method` field will be used as the HTTP request method:
@@ -763,7 +792,7 @@ If you want to store the token elsewhere, please refer to the "Creating custom T
 When you've created your CSRF-verifier you need to tell simple-php-router that it should use it. You can do this by adding the following line in your `routes.php` file:

 ```php
-Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
+SimpleRouter::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
 ```

 ## Getting CSRF-token
@@ -779,7 +808,7 @@ csrf_token();
 You can also get the token directly:

 ```php
-return Router::router()->getCsrfVerifier()->getTokenProvider()->getToken();
+return SimpleRouter::router()->getCsrfVerifier()->getTokenProvider()->getToken();
 ```

 The default name/key for the input-field is `csrf_token` and is defined in the `POST_KEY` constant in the `BaseCsrfVerifier` class.
@@ -865,10 +894,10 @@ class SessionTokenProvider implements ITokenProvider
 Next you need to set your custom `ITokenProvider` implementation on your `BaseCsrfVerifier` class in your routes file:

 ```php
-$verifier = new \dscuz\Middleware\CsrfVerifier();
+$verifier = new \Demo\Middlewares\CsrfVerifier();
 $verifier->setTokenProvider(new SessionTokenProvider());

-Router::csrfVerifier($verifier);
+SimpleRouter::csrfVerifier($verifier);
 ```

 ---
@@ -910,7 +939,7 @@ ExceptionHandler are classes that handles all exceptions. ExceptionsHandlers mus

 ## Handling 404, 403 and other errors

-If you simply want to catch a 404 (page not found) etc. you can use the `Router::error($callback)` static helper method.
+If you simply want to catch a 404 (page not found) etc. you can use the `SimpleRouter::error($callback)` static helper method.

 This will add a callback method which is fired whenever an error occurs on all routes.

@@ -918,17 +947,37 @@ The basic example below simply redirect the page to `/not-found` if an `NotFound
 The code should be placed in the file that contains your routes.

 ```php
-Router::get('/not-found', 'PageController@notFound');
+SimpleRouter::get('/not-found', 'PageController@notFound');
+SimpleRouter::get('/forbidden', 'PageController@notFound');

-Router::error(function(Request $request, \Exception $exception) {
+SimpleRouter::error(function(Request $request, \Exception $exception) {

-    if($exception instanceof NotFoundHttpException && $exception->getCode() === 404) {
-        response()->redirect('/not-found');
+    switch($exception->getCode()) {
+        // Page not found
+        case 404:
+            response()->redirect('/not-found');
+        // Forbidden
+        case 403:
+            response()->redirect('/forbidden');
    }
    
 });
 ```

+The example above will redirect all errors with http-code `404` (page not found) to `/not-found` and `403` (forbidden) to `/forbidden`.
+
+If you do not want a redirect, but want the error-page rendered on the current-url, you can tell the router to execute a rewrite callback like so:
+
+```php
+$request->setRewriteCallback('ErrorController@notFound');
+```
+
+If you will set the correct status for the browser error use:
+
+```php
+SimpleRouter::response()->httpCode(404);
+```
+
 ## Using custom exception handlers

 This is a basic example of an ExceptionHandler implementation (please see "[Easily overwrite route about to be loaded](#easily-overwrite-route-about-to-be-loaded)" for examples on how to change callback).
@@ -972,6 +1021,41 @@ class CustomExceptionHandler implements IExceptionHandler
 }
 ```

+You can add your custom exception-handler class to your group by using the `exceptionHandler` settings-attribute.
+`exceptionHandler` can be either class-name or array of class-names.
+
+```php
+SimpleRouter::group(['exceptionHandler' => \Demo\Handlers\CustomExceptionHandler::class], function() {
+
+    // Your routes here
+
+});
+```
+
+### Prevent merge of parent exception-handlers
+
+By default the router will merge exception-handlers to any handlers provided by parent groups, and will be executed in the order of newest to oldest.
+
+If you want your groups exception handler to be executed independently, you can add the `mergeExceptionHandlers` attribute and set it to `false`.
+
+```php
+SimpleRouter::group(['prefix' => '/', 'exceptionHandler' => \Demo\Handlers\FirstExceptionHandler::class, 'mergeExceptionHandlers' => false], function() {
+
+	SimpleRouter::group(['prefix' => '/admin', 'exceptionHandler' => \Demo\Handlers\SecondExceptionHandler::class], function() {
+	
+		// Both SecondExceptionHandler and FirstExceptionHandler will trigger (in that order).
+	
+	});
+	
+	SimpleRouter::group(['prefix' => '/user', 'exceptionHandler' => \Demo\Handlers\SecondExceptionHandler::class, 'mergeExceptionHandlers' => false], function() {
+	
+		// Only SecondExceptionHandler will trigger.
+	
+	});
+
+});
+```
+
 ---

 # Urls
@@ -1209,8 +1293,11 @@ $values = input()->all([
 All object implements the `IInputItem` interface and will always contain these methods:

 - `getIndex()` - returns the index/key of the input.
+- `setIndex()` - set the index/key of the input.
 - `getName()` - returns a human friendly name for the input (company_name will be Company Name etc).
+- `setName()` - sets a human friendly name for the input (company_name will be Company Name etc).
 - `getValue()` - returns the value of the input.
+- `setValue()` - sets the value of the input.

 `InputFile` has the same methods as above along with some other file-specific methods like:

@@ -1226,6 +1313,24 @@ All object implements the `IInputItem` interface and will always contain these m

 ---

+### Check if parameters exists
+
+You can easily if multiple items exists by using the `exists` method. It's simular to `value` as it can be used 
+to filter on request-methods and supports both `string` and `array` as parameter value.
+
+**Example:**
+
+```php
+if(input()->exists(['name', 'lastname'])) {
+	// Do stuff
+}
+
+/* Similar to code above */
+if(input()->exists('name') && input()->exists('lastname')) {
+	// Do stuff
+}
+```
+
 # Events

 This section will help you understand how to register your own callbacks to events in the router.
@@ -1242,13 +1347,13 @@ All event callbacks will retrieve a `EventArgument` object as parameter. This ob
 | `EVENT_ALL`                 | - | Fires when a event is triggered. |
 | `EVENT_INIT`                | - | Fires when router is initializing and before routes are loaded. |
 | `EVENT_LOAD`                | `loadedRoutes` | Fires when all routes has been loaded and rendered, just before the output is returned. |
-| `EVENT_ADD_ROUTE`           | `route` | Fires when route is added to the router. |
+| `EVENT_ADD_ROUTE`           | `route`<br>`isSubRoute` | Fires when route is added to the router. `isSubRoute` is true when sub-route is rendered. |
 | `EVENT_REWRITE`             | `rewriteUrl`<br>`rewriteRoute` | Fires when a url-rewrite is and just before the routes are re-initialized. |
 | `EVENT_BOOT`                | `bootmanagers` | Fires when the router is booting. This happens just before boot-managers are rendered and before any routes has been loaded. |
 | `EVENT_RENDER_BOOTMANAGER`  | `bootmanagers`<br>`bootmanager` | Fires before a boot-manager is rendered. |
 | `EVENT_LOAD_ROUTES`         | `routes` | Fires when the router is about to load all routes. |
 | `EVENT_FIND_ROUTE`          | `name` | Fires whenever the `findRoute` method is called within the `Router`. This usually happens when the router tries to find routes that contains a certain url, usually after the `EventHandler::EVENT_GET_URL` event. |
-| `EVENT_GET_URL`             | `name`<br>`parameters`<br>`getParams` | Fires whenever the `Router::getUrl` method or `url`-helper function is called and the router tries to find the route. |
+| `EVENT_GET_URL`             | `name`<br>`parameters`<br>`getParams` | Fires whenever the `SimpleRouter::getUrl` method or `url`-helper function is called and the router tries to find the route. |
 | `EVENT_MATCH_ROUTE`         | `route` | Fires when a route is matched and valid (correct request-type etc). and before the route is rendered. |
 | `EVENT_RENDER_ROUTE`        | `route` | Fires before a route is rendered. |
 | `EVENT_LOAD_EXCEPTIONS`     | `exception`<br>`exceptionHandlers` | Fires when the router is loading exception-handlers. |
@@ -1370,6 +1475,74 @@ By default the router will try to execute all routes that matches a given url. T

 This behavior can be easily disabled by setting `SimpleRouter::enableMultiRouteRendering(false)` in your `routes.php` file. This is the same behavior as version 3 and below.

+## Restrict access to IP
+
+You can white and/or blacklist access to IP's using the build in `IpRestrictAccess` middleware.
+
+Create your own custom Middleware and extend the `IpRestrictAccess` class.
+
+The `IpRestrictAccess` class contains two properties `ipBlacklist` and `ipWhitelist` that can be added to your middleware to change which IP's that have access to your routes.
+
+You can use `*` to restrict access to a range of ips.
+
+```php
+use \Pecee\Http\Middleware\IpRestrictAccess;
+
+class IpBlockerMiddleware extends IpRestrictAccess 
+{
+
+    protected $ipBlacklist = [
+        '5.5.5.5',
+        '8.8.*',
+    ];
+
+    protected $ipWhitelist = [
+        '8.8.2.2',
+    ];
+
+}
+```
+
+You can add the middleware to multiple routes by adding your [middleware to a group](#middleware).
+
+## Setting custom base path
+
+Sometimes it can be useful to add a custom base path to all of the routes added.
+
+This can easily be done by taking advantage of the [Event Handlers](#events) support of the project.
+
+```php
+$basePath = '/basepath';
+
+$eventHandler = new EventHandler();
+$eventHandler->register(EventHandler::EVENT_ADD_ROUTE, function(EventArgument $event) use($basePath) {
+
+	$route = $event->route;
+
+	// Skip routes added by group as these will inherit the url
+	if(!$event->isSubRoute) {
+		return;
+	}
+	
+	switch (true) {
+		case $route instanceof ILoadableRoute:
+			$route->prependUrl($basePath);
+			break;
+		case $route instanceof IGroupRoute:
+			$route->prependPrefix($basePath);
+			break;
+
+	}
+	
+});
+
+SimpleRouter::addEventHandler($eventHandler);
+```
+
+In the example shown above, we create a new `EVENT_ADD_ROUTE` event that triggers, when a new route is added.
+We skip all subroutes as these will inherit the url from their parent. Then, if the route is a group, we change the prefix  
+otherwise we change the url.
+
 ## Url rewriting

 ### Changing current route
@@ -1656,40 +1829,17 @@ You can read more about adding your own custom regular expression for matching p

 ### Multiple routes matches? Which one has the priority?

-The router will match routes in the order they're added.
+The router will match routes in the order they're added and will render multiple routes, if they match.

-It's possible to render multiple routes.
-
-If you want the router to stop when a route is matched, you simply return a value in your callback or stop the execution manually (using `response()->json()` etc.). 
+If you want the router to stop when a route is matched, you simply return a value in your callback or stop the execution manually (using `response()->json()` etc.) or simply by returning a result.

 Any returned objects that implements the `__toString()` magic method will also prevent other routes from being rendered. 

+If you want the router only to execute one route per request, you can [disabling multiple route rendering](#disable-multiple-route-rendering).
+
 ### Using the router on sub-paths

-Using the library on a sub-path like `localhost/project/` is not officially supported, however it is possible to get it working quite easily.
-
-Add an event that appends your sub-path when a new loadable route is added.
-
-**Example:**
-
-```php
-// ... your routes.php file
-
-if($isRunningLocally) {
-
-    $eventHandler = new EventHandler();
-    $eventHandler->register(EventHandler::EVENT_ADD_ROUTE, function (EventArgument $arg) use (&$status) {
-
-        if ($arg->route instanceof \Pecee\SimpleRouter\Route\LoadableRoute) {
-            $arg->route->prependUrl('/local-path');
-        }
-
-    });
-
-    TestRouter::addEventHandler($eventHandler);
-
-}
-```
+Please refer to [Setting custom base path](#setting-custom-base-path) part of the documentation.

 ## Debugging

@@ -1929,4 +2079,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
@@ -27,12 +27,16 @@
    }
  ],
  "require": {
-    "php": ">=7.1",
+    "php": ">=7.4",
    "ext-json": "*"
  },
  "require-dev": {
-    "phpunit/phpunit": "^7",
-    "mockery/mockery": "^1"
+    "phpunit/phpunit": "^8",
+    "mockery/mockery": "^1",
+    "phpstan/phpstan": "^0",
+    "phpstan/phpstan-phpunit": "^0",
+    "phpstan/phpstan-deprecation-rules": "^0",
+    "phpstan/phpstan-strict-rules": "^0"
  },
  "scripts": {
    "test": [
@@ -43,5 +47,10 @@
    "psr-4": {
      "Pecee\\": "src/Pecee/"
    }
+  },
+  "config": {
+    "allow-plugins": {
+      "ocramius/package-versions": true
+    }
  }
-}
+}
@@ -0,0 +1,22 @@
+parameters:
+	level: 6
+	paths:
+		- src
+	fileExtensions:
+		- php
+	bootstrapFiles:
+	    - ./vendor/autoload.php
+	ignoreErrors:
+	reportUnmatchedIgnoredErrors: true
+	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
+	parallel:
+		processTimeout: 300.0
+		jobSize: 10
+		maximumNumberOfProcesses: 4
+		minimumNumberOfJobsPerProcess: 4
+includes:
+    - vendor/phpstan/phpstan-strict-rules/rules.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
+    - vendor/phpstan/phpstan-deprecation-rules/rules.neon
@@ -6,43 +6,43 @@ interface IResourceController
 {

    /**
-     * @return string|null
+     * @return mixed
     */
-    public function index(): ?string;
+    public function index();

    /**
     * @param mixed $id
-     * @return string|null
+     * @return mixed
     */
-    public function show($id): ?string;
+    public function show($id);

    /**
-     * @return string|null
+     * @return mixed
     */
-    public function store(): ?string;
+    public function store();

    /**
-     * @return string|null
+     * @return mixed
     */
-    public function create(): ?string;
+    public function create();

    /**
     * View
     * @param mixed $id
-     * @return string|null
+     * @return mixed
     */
-    public function edit($id): ?string;
+    public function edit($id);

    /**
     * @param mixed $id
-     * @return string|null
+     * @return mixed
     */
-    public function update($id): ?string;
+    public function update($id);

    /**
     * @param mixed $id
-     * @return string|null
+     * @return mixed
     */
-    public function destroy($id): ?string;
+    public function destroy($id);

 }
@@ -13,8 +13,14 @@ interface IInputItem

    public function setName(string $name): self;

+    /**
+     * @return mixed
+     */
    public function getValue();

+    /**
+     * @param mixed $value
+     */
    public function setValue($value): self;

    public function __toString(): string;
@@ -6,12 +6,39 @@ use Pecee\Exceptions\InvalidArgumentException;

 class InputFile implements IInputItem
 {
+    /**
+     * @var string
+     */
    public $index;
+
+    /**
+     * @var string
+     */
    public $name;
+
+    /**
+     * @var string|null
+     */
    public $filename;
+
+    /**
+     * @var int|null
+     */
    public $size;
+
+    /**
+     * @var int|null
+     */
    public $type;
+
+    /**
+     * @var int
+     */
    public $errors;
+
+    /**
+     * @var string|null
+     */
    public $tmpName;

    public function __construct(string $index)
@@ -165,7 +192,7 @@ class InputFile implements IInputItem
     * @param string $name
     * @return static
     */
-    public function setFilename($name): IInputItem
+    public function setFilename(string $name): IInputItem
    {
        $this->filename = $name;

@@ -188,7 +215,7 @@ class InputFile implements IInputItem
     * @param string $destination
     * @return bool
     */
-    public function move($destination): bool
+    public function move(string $destination): bool
    {
        return move_uploaded_file($this->tmpName, $destination);
    }
@@ -216,20 +243,20 @@ class InputFile implements IInputItem
    /**
     * Get upload-error code.
     *
-     * @return int
+     * @return int|null
     */
-    public function getError(): int
+    public function getError(): ?int
    {
-        return (int)$this->errors;
+        return $this->errors;
    }

    /**
     * Set error
     *
-     * @param int $error
+     * @param int|null $error
     * @return static
     */
-    public function setError($error): IInputItem
+    public function setError(?int $error): IInputItem
    {
        $this->errors = (int)$error;

@@ -249,7 +276,7 @@ class InputFile implements IInputItem
     * @param string $name
     * @return static
     */
-    public function setTmpName($name): IInputItem
+    public function setTmpName(string $name): IInputItem
    {
        $this->tmpName = $name;

@@ -261,7 +288,7 @@ class InputFile implements IInputItem
        return $this->getTmpName();
    }

-    public function getValue()
+    public function getValue(): string
    {
        return $this->getFilename();
    }
@@ -115,7 +115,7 @@ class InputHandler

            // Handle array input
            if (is_array($value['name']) === false) {
-                $values['index'] = $parentKey ?? $key;
+                $values = ['index' => $parentKey ?? $key];

                try {
                    $list[$key] = InputFile::createFromArray($values + $value);
@@ -147,7 +147,7 @@ class InputHandler
     * @param array|null $original
     * @return array
     */
-    protected function rearrangeFile(array $values, &$index, $original): array
+    protected function rearrangeFile(array $values, array &$index, ?array $original): array
    {
        $originalIndex = $index[0];
        array_shift($index);
@@ -161,7 +161,7 @@ class InputHandler
                try {

                    $file = InputFile::createFromArray([
-                        'index'    => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key,
+                        'index'    => ($key === '' && $originalIndex !== '') ? $originalIndex : $key,
                        'name'     => $original['name'][$key],
                        'error'    => $original['error'][$key],
                        'tmp_name' => $original['tmp_name'][$key],
@@ -293,14 +293,26 @@ class InputHandler
    }

    /**
-     * Check if a input-item exist
+     * Check if a input-item exist.
+     * If an array is as $index parameter the method returns true if all elements exist.
     *
-     * @param string $index
+     * @param string|array $index
     * @param array ...$methods
     * @return bool
     */
-    public function exists(string $index, ...$methods): bool
+    public function exists($index, ...$methods): bool
    {
+        // Check array
+        if(is_array($index) === true) {
+            foreach($index as $key) {
+                if($this->value($key, null, ...$methods) === null) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
        return $this->value($index, null, ...$methods) !== null;
    }

@@ -308,10 +320,10 @@ class InputHandler
     * Find post-value by index or return default value.
     *
     * @param string $index
-     * @param string|null $defaultValue
+     * @param mixed|null $defaultValue
     * @return InputItem|array|string|null
     */
-    public function post(string $index, ?string $defaultValue = null)
+    public function post(string $index, $defaultValue = null)
    {
        return $this->post[$index] ?? $defaultValue;
    }
@@ -320,10 +332,10 @@ class InputHandler
     * Find file by index or return default value.
     *
     * @param string $index
-     * @param string|null $defaultValue
+     * @param mixed|null $defaultValue
     * @return InputFile|array|string|null
     */
-    public function file(string $index, ?string $defaultValue = null)
+    public function file(string $index, $defaultValue = null)
    {
        return $this->file[$index] ?? $defaultValue;
    }
@@ -332,10 +344,10 @@ class InputHandler
     * Find parameter/query-string by index or return default value.
     *
     * @param string $index
-     * @param string|null $defaultValue
+     * @param mixed|null $defaultValue
     * @return InputItem|array|string|null
     */
-    public function get(string $index, ?string $defaultValue = null)
+    public function get(string $index, $defaultValue = null)
    {
        return $this->get[$index] ?? $defaultValue;
    }
@@ -2,10 +2,11 @@

 namespace Pecee\Http\Input;

+use ArrayAccess;
 use ArrayIterator;
 use IteratorAggregate;

-class InputItem implements IInputItem, IteratorAggregate
+class InputItem implements ArrayAccess, IInputItem, IteratorAggregate
 {
    public $index;
    public $name;
@@ -75,9 +76,34 @@ class InputItem implements IInputItem, IteratorAggregate
        return $this;
    }

+    public function offsetExists($offset): bool
+    {
+        return isset($this->value[$offset]);
+    }
+
+    public function offsetGet($offset): ?self
+    {
+        if ($this->offsetExists($offset) === true) {
+            return $this->value[$offset];
+        }
+
+        return null;
+    }
+
+    public function offsetSet($offset, $value): void
+    {
+        $this->value[$offset] = $value;
+    }
+
+    public function offsetUnset($offset): void
+    {
+        unset($this->value[$offset]);
+    }
+
    public function __toString(): string
    {
        $value = $this->getValue();
+
        return (is_array($value) === true) ? json_encode($value) : $value;
    }

@@ -12,7 +12,22 @@ class BaseCsrfVerifier implements IMiddleware
    public const POST_KEY = 'csrf_token';
    public const HEADER_KEY = 'X-CSRF-TOKEN';

+    /**
+     * Urls to ignore. You can use * to exclude all sub-urls on a given path.
+     * For example: /admin/*
+     * @var array|null
+     */
    protected $except;
+
+    /**
+     * Urls to include. Can be used to include urls from a certain path.
+     * @var array|null
+     */
+    protected $include;
+
+    /**
+     * @var ITokenProvider
+     */
    protected $tokenProvider;

    /**
@@ -34,20 +49,34 @@ class BaseCsrfVerifier implements IMiddleware
            return false;
        }

-        $max = count($this->except) - 1;
-
-        for ($i = $max; $i >= 0; $i--) {
-            $url = $this->except[$i];
-
+        foreach($this->except as $url) {
            $url = rtrim($url, '/');
            if ($url[strlen($url) - 1] === '*') {
                $url = rtrim($url, '*');
                $skip = $request->getUrl()->contains($url);
            } else {
-                $skip = ($url === $request->getUrl()->getOriginalUrl());
+                $skip = ($url === rtrim($request->getUrl()->getRelativeUrl(false), '/'));
            }

            if ($skip === true) {
+
+                if(is_array($this->include) === true && count($this->include) > 0) {
+                    foreach($this->include as $includeUrl) {
+                        $includeUrl = rtrim($includeUrl, '/');
+                        if ($includeUrl[strlen($includeUrl) - 1] === '*') {
+                            $includeUrl = rtrim($includeUrl, '*');
+                            $skip = !$request->getUrl()->contains($includeUrl);
+                            break;
+                        }
+
+                        $skip = !($includeUrl === rtrim($request->getUrl()->getRelativeUrl(false), '/'));
+                    }
+                }
+
+                if($skip === false) {
+                    continue;
+                }
+
                return true;
            }
        }
@@ -0,0 +1,47 @@
+<?php
+
+namespace Pecee\Http\Middleware;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Exceptions\HttpException;
+
+abstract class IpRestrictAccess implements IMiddleware
+{
+    protected $ipBlacklist = [];
+    protected $ipWhitelist = [];
+
+    protected function validate(string $ip): bool
+    {
+        // Accept ip that is in white-list
+        if(in_array($ip, $this->ipWhitelist, true) === true) {
+            return true;
+        }
+
+        foreach ($this->ipBlacklist as $blackIp) {
+
+            // Blocks range (8.8.*)
+            if ($blackIp[strlen($blackIp) - 1] === '*' && strpos($ip, trim($blackIp, '*')) === 0) {
+                return false;
+            }
+
+            // Blocks exact match
+            if ($blackIp === $ip) {
+                return false;
+            }
+
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Request $request
+     * @throws HttpException
+     */
+    public function handle(Request $request): void
+    {
+        if($this->validate((string)$request->getIp()) === false) {
+            throw new HttpException(sprintf('Restricted ip. Access to %s has been blocked', $request->getIp()), 403);
+        }
+    }
+}
@@ -129,7 +129,12 @@ class Request
        $this->setHost($this->getHeader('http-host'));

        // Check if special IIS header exist, otherwise use default.
-        $this->setUrl(new Url($this->getFirstHeader(['unencoded-url', 'request-uri'])));
+        $url = $this->getHeader('unencoded-url');
+        if($url !== null){
+            $this->setUrl(new Url($url));
+        }else{
+            $this->setUrl(new Url(urldecode((string)$this->getHeader('request-uri'))));
+        }
        $this->setContentType((string)$this->getHeader('content-type'));
        $this->setMethod((string)($_POST[static::FORCE_METHOD_KEY] ?? $this->getHeader('request-method')));
        $this->inputHandler = new InputHandler($this);
@@ -137,7 +142,7 @@ class Request

    public function isSecure(): bool
    {
-        return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
+        return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || (int)$this->getHeader('server-port') === 443;
    }

    /**
@@ -264,12 +269,12 @@ class Request
     * Get header value by name
     *
     * @param string $name Name of the header.
-     * @param string|null $defaultValue Value to be returned if header is not found.
+     * @param string|mixed|null $defaultValue Value to be returned if header is not found.
     * @param bool $tryParse When enabled the method will try to find the header from both from client (http) and server-side variants, if the header is not found.
     *
     * @return string|null
     */
-    public function getHeader(string $name, $defaultValue = null, $tryParse = true): ?string
+    public function getHeader(string $name, $defaultValue = null, bool $tryParse = true): ?string
    {
        $name = strtolower($name);
        $header = $this->headers[$name] ?? null;
@@ -359,7 +364,7 @@ class Request
     */
    public function isAjax(): bool
    {
-        return (strtolower($this->getHeader('http-x-requested-with')) === 'xmlhttprequest');
+        return (strtolower((string)$this->getHeader('http-x-requested-with')) === 'xmlhttprequest');
    }

    /**
@@ -391,6 +396,10 @@ class Request
        if ($this->url->getHost() === null) {
            $this->url->setHost((string)$this->getHost());
        }
+
+        if($this->isSecure() === true) {
+            $this->url->setScheme('https');
+        }
    }

    /**
@@ -87,11 +87,11 @@ class Response
    /**
     * Json encode
     * @param array|JsonSerializable $value
-     * @param ?int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
+     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
     * @param int $dept JSON debt.
     * @throws InvalidArgumentException
     */
-    public function json($value, ?int $options = null, int $dept = 512): void
+    public function json($value, int $options = 0, int $dept = 512): void
    {
        if (($value instanceof JsonSerializable) === false && is_array($value) === false) {
            throw new InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
@@ -9,7 +9,14 @@ class CookieTokenProvider implements ITokenProvider
 {
    public const CSRF_KEY = 'CSRF-TOKEN';

+    /**
+     * @var string
+     */
    protected $token;
+
+    /**
+     * @var int
+     */
    protected $cookieTimeoutMinutes = 120;

    /**
@@ -7,15 +7,49 @@ use Pecee\Http\Exceptions\MalformedUrlException;

 class Url implements JsonSerializable
 {
+    /**
+     * @var string|null
+     */
    private $originalUrl;

+    /**
+     * @var string|null
+     */
    private $scheme;
+
+    /**
+     * @var string|null
+     */
    private $host;
+
+    /**
+     * @var int|null
+     */
    private $port;
+
+    /**
+     * @var string|null
+     */
    private $username;
+
+    /**
+     * @var string|null
+     */
    private $password;
+
+    /**
+     * @var string|null
+     */
    private $path;
+
+    /**
+     * @var array
+     */
    private $params = [];
+
+    /**
+     * @var string|null
+     */
    private $fragment;

    /**
@@ -248,8 +282,9 @@ class Url implements JsonSerializable
    public function setQueryString(string $queryString): self
    {
        $params = [];
+        parse_str($queryString, $params);

-        if(parse_str($queryString, $params) !== false) {
+        if(count($params) > 0) {
            return $this->setParams($params);
        }

@@ -341,7 +376,7 @@ class Url implements JsonSerializable
     */
    public function removeParams(...$names): self
    {
-        $params = array_diff_key($this->getParams(), array_flip($names));
+        $params = array_diff_key($this->getParams(), array_flip(...$names));
        $this->setParams($params);

        return $this;
@@ -386,7 +421,7 @@ class Url implements JsonSerializable
    {
        $encodedUrl = preg_replace_callback(
            '/[^:\/@?&=#]+/u',
-            static function ($matches) {
+            static function ($matches): string {
                return urlencode($matches[0]);
            },
            $url
@@ -413,7 +448,7 @@ class Url implements JsonSerializable
        if (count($getParams) !== 0) {

            if ($includeEmpty === false) {
-                $getParams = array_filter($getParams, static function ($item) {
+                $getParams = array_filter($getParams, static function ($item): bool {
                    return (trim($item) !== '');
                });
            }
@@ -427,14 +462,18 @@ class Url implements JsonSerializable
    /**
     * Returns the relative url
     *
+     * @param bool $includeParams
     * @return string
     */
-    public function getRelativeUrl(): string
+    public function getRelativeUrl(bool $includeParams = true): string
    {
-        $params = $this->getQueryString();
+        $path = $this->path ?? '/';

-        $path = $this->path ?? '';
-        $query = $params !== '' ? '?' . $params : '';
+        if($includeParams === false) {
+            return $path;
+        }
+
+        $query = $this->getQueryString() !== '' ? '?' . $this->getQueryString() : '';
        $fragment = $this->fragment !== null ? '#' . $this->fragment : '';

        return $path . $query . $fragment;
@@ -443,24 +482,25 @@ class Url implements JsonSerializable
    /**
     * Returns the absolute url
     *
+     * @param bool $includeParams
     * @return string
     */
-    public function getAbsoluteUrl(): string
+    public function getAbsoluteUrl(bool $includeParams = true): string
    {
        $scheme = $this->scheme !== null ? $this->scheme . '://' : '';
        $host = $this->host ?? '';
        $port = $this->port !== null ? ':' . $this->port : '';
        $user = $this->username ?? '';
        $pass = $this->password !== null ? ':' . $this->password : '';
-        $pass = ($user || $pass) ? $pass . '@' : '';
+        $pass = ($user !== '' || $pass !== '') ? $pass . '@' : '';

-        return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl();
+        return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl($includeParams);
    }

    /**
     * Specify data which should be serialized to JSON
     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * @return string data which can be serialized by <b>json_encode</b>,
     * which is a value of any type other than a resource.
     * @since 5.4.0
     */
@@ -24,7 +24,7 @@ class EventArgument implements IEventArgument
     */
    protected $arguments = [];

-    public function __construct($eventName, $router, array $arguments = [])
+    public function __construct(string $eventName, Router $router, array $arguments = [])
    {
        $this->eventName = $eventName;
        $this->router = $router;
@@ -94,7 +94,7 @@ class EventArgument implements IEventArgument
     * @param mixed $value
     * @throws InvalidArgumentException
     */
-    public function __set(string $name, $value)
+    public function __set(string $name, $value): void
    {
        throw new InvalidArgumentException('Not supported');
    }
@@ -6,10 +6,17 @@ use Throwable;

 class ClassNotFoundHttpException extends NotFoundHttpException
 {
+    /**
+     * @var string
+     */
    protected $class;
+
+    /**
+     * @var string|null
+     */
    protected $method;

-    public function __construct(string $class, ?string $method = null, $message = "", $code = 0, Throwable $previous = null)
+    public function __construct(string $class, ?string $method = null, string $message = "", int $code = 0, Throwable $previous = null)
    {
        parent::__construct($message, $code, $previous);

@@ -17,6 +17,9 @@ use Pecee\Http\Request;
 class CallbackExceptionHandler implements IExceptionHandler
 {

+    /**
+     * @var Closure
+     */
    protected $callback;

    public function __construct(Closure $callback)
@@ -17,7 +17,7 @@ class DebugEventHandler implements IEventHandler

    public function __construct()
    {
-        $this->callback = static function (EventArgument $argument) {
+        $this->callback = static function (EventArgument $argument): void {
            // todo: log in database
        };
    }
@@ -47,7 +47,7 @@ class DebugEventHandler implements IEventHandler
    public function fireEvents(Router $router, string $name, array $eventArgs = []): void
    {
        $callback = $this->callback;
-        $callback(new EventArgument($router, $eventArgs));
+        $callback(new EventArgument($name, $router, $eventArgs));
    }

    /**
@@ -2,7 +2,7 @@

 namespace Pecee\SimpleRouter\Route;

-interface IControllerRoute extends IRoute
+interface IControllerRoute extends ILoadableRoute
 {
    /**
     * Get controller class-name
@@ -31,6 +31,21 @@ interface IGroupRoute extends IRoute
     */
    public function setExceptionHandlers(array $handlers): self;

+    /**
+     * Returns true if group should overwrite existing exception-handlers.
+     *
+     * @return bool
+     */
+    public function getMergeExceptionHandlers(): bool;
+
+    /**
+     * When enabled group will overwrite any existing exception-handlers.
+     *
+     * @param bool $merge
+     * @return static
+     */
+    public function setMergeExceptionHandlers(bool $merge): self;
+
    /**
     * Get exception-handlers for group
     *
@@ -53,6 +68,14 @@ interface IGroupRoute extends IRoute
     */
    public function setDomains(array $domains): self;

+    /**
+     * Prepends prefix while ensuring that the url has the correct formatting.
+     *
+     * @param string $url
+     * @return static
+     */
+    public function prependPrefix(string $url): self;
+
    /**
     * Set prefix that child-routes will inherit.
     *
@@ -40,7 +40,7 @@ interface ILoadableRoute extends IRoute
    public function setUrl(string $url): self;

    /**
-     * Prepend url
+     * Prepends url while ensuring that the url has the correct formatting.
     * @param string $url
     * @return ILoadableRoute
     */
@@ -19,6 +19,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     */
    protected $name;

+    /**
+     * @var string|null
+     */
    protected $regex;

    /**
@@ -55,12 +58,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
    public function matchRegex(Request $request, $url): ?bool
    {
        /* Match on custom defined regular expression */
-
        if ($this->regex === null) {
            return null;
        }

-        return ((bool)preg_match($this->regex, $url) !== false);
+        $parameters = [];
+        if ((bool)preg_match($this->regex, $url, $parameters) !== false) {
+            $this->setParameters($parameters);
+
+            return true;
+        }
+
+        return false;
    }

    /**
@@ -86,7 +95,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
    }

    /**
-     * Prepend url
+     * Prepends url while ensuring that the url has the correct formatting.
     *
     * @param string $url
     * @return ILoadableRoute
@@ -101,6 +110,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        return $this->url;
    }

+    /**
+     * Returns true if group is defined and matches the given url.
+     *
+     * @param string $url
+     * @param Request $request
+     * @return bool
+     */
+    protected function matchGroup(string $url, Request $request): bool
+    {
+        return ($this->getGroup() === null || $this->getGroup()->matchRoute($url, $request) === true);
+    }
+
    /**
     * Find url that matches method, parameters or name.
     * Used when calling the url() helper.
@@ -146,7 +167,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute

            if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
                /* Add parameter to the correct position */
-                $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
+                $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], (string)$value, $url);
            } else {
                /* Parameter aren't recognized and will be appended at the end of the url */
                $url .= $value . '/';
@@ -174,7 +195,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     */
    public function hasName(string $name): bool
    {
-        return strtolower($this->name) === strtolower($name);
+        return strtolower((string)$this->name) === strtolower((string)$name);
    }

    /**
@@ -204,9 +225,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * Sets the router name, which makes it easier to obtain the url or router at a later point.
     * Alias for LoadableRoute::setName().
     *
-     * @see LoadableRoute::setName()
     * @param string|array $name
     * @return static
+     * @see LoadableRoute::setName()
     */
    public function name($name): ILoadableRoute
    {
@@ -30,6 +30,9 @@ abstract class Route implements IRoute
    protected $urlRegex = '/^%s\/?$/u';
    protected $group;
    protected $parent;
+    /**
+     * @var string|callable|null
+     */
    protected $callback;
    protected $defaultNamespace;

@@ -67,7 +70,7 @@ abstract class Route implements IRoute

        /* Filter parameters with null-value */
        if ($this->filterEmptyParams === true) {
-            $parameters = array_filter($parameters, static function ($var) {
+            $parameters = array_filter($parameters, static function ($var): bool {
                return ($var !== null);
            });
        }
@@ -76,7 +79,13 @@ abstract class Route implements IRoute
        if (is_callable($callback) === true) {
            $router->debug('Executing callback');

+            /* Load class from type hinting */
+            if (is_array($callback) === true && isset($callback[0], $callback[1]) === true) {
+                $callback[0] = $router->getClassLoader()->loadClass($callback[0]);
+            }
+
            /* When the callback is a function */
+
            return $router->getClassLoader()->loadClosure($callback, $parameters);
        }

@@ -114,7 +123,8 @@ abstract class Route implements IRoute
            );

        // Ensures that host names/domains will work with parameters
-        $url = '/' . ltrim($url, '/');
+        
+        if($route[0] == '{') $url = '/' . ltrim($url, '/');
        $urlRegex = '';
        $parameters = [];

@@ -122,7 +132,7 @@ abstract class Route implements IRoute
            $urlRegex = preg_quote($route, '/');
        } else {

-            foreach (preg_split('/((-?\/?){[^}]+})/', $route) as $key => $t) {
+            foreach (preg_split('/((\.?-?\/?){[^}]+})/', $route) as $key => $t) {

                $regex = '';

@@ -137,7 +147,7 @@ abstract class Route implements IRoute
                        $regex = $parameterRegex ?? $this->defaultParameterRegex ?? static::PARAMETERS_DEFAULT_REGEX;
                    }

-                    $regex = sprintf('((\/|-)(?P<%2$s>%3$s))%1$s', $parameters[2][$key], $name, $regex);
+                    $regex = sprintf('((\/|-|\.)(?P<%2$s>%3$s))%1$s', $parameters[2][$key], $name, $regex);
                }

                $urlRegex .= preg_quote($t, '/') . $regex;
@@ -160,7 +170,7 @@ abstract class Route implements IRoute
            foreach ((array)$parameters[1] as $name) {

                // Ignore parent parameters
-                if(isset($groupParameters[$name]) === true) {
+                if (isset($groupParameters[$name]) === true) {
                    $lastParams[$name] = $matches[$name];
                    continue;
                }
@@ -244,6 +254,7 @@ abstract class Route implements IRoute
        $this->group = $group;

        /* Add/merge parent settings with child */
+
        return $this->setSettings($group->toArray(), true);
    }

@@ -274,7 +285,7 @@ abstract class Route implements IRoute
    }

    /**
-     * @return string|callable
+     * @return string|callable|null
     */
    public function getCallback()
    {
@@ -331,6 +342,22 @@ abstract class Route implements IRoute
     */
    public function setNamespace(string $namespace): IRoute
    {
+        // Do not set namespace when class-hinting is used
+        if (is_array($this->callback) === true) {
+            return $this;
+        }
+
+        $ns = $this->getNamespace();
+
+        if ($ns !== null) {
+            // Don't overwrite namespaces that starts with \
+            if ($ns[0] !== '\\') {
+                $namespace .= '\\' . $ns;
+            } else {
+                $namespace = $ns;
+            }
+        }
+
        $this->namespace = $namespace;

        return $this;
@@ -401,7 +428,7 @@ abstract class Route implements IRoute
     */
    public function setSettings(array $settings, bool $merge = false): IRoute
    {
-        if ($this->namespace === null && isset($settings['namespace']) === true) {
+        if (isset($settings['namespace']) === true) {
            $this->setNamespace($settings['namespace']);
        }

@@ -576,6 +603,7 @@ abstract class Route implements IRoute
    public function setFilterEmptyParams(bool $enabled): IRoute
    {
        $this->filterEmptyParams = $enabled;
+
        return $this;
    }

@@ -52,7 +52,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        if (strpos($name, '.') !== false) {
-            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
+            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, true);
            if ($found !== false) {
                $method = (string)$found;
            }
@@ -67,7 +67,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
            foreach (Request::$requestTypes as $requestType) {

                if (stripos($method, $requestType) === 0) {
-                    $method = (string)substr($method, strlen($requestType));
+                    $method = substr($method, strlen($requestType));
                    break;
                }
            }
@@ -81,14 +81,14 @@ class RouteController extends LoadableRoute implements IControllerRoute
            $url .= '//' . $group->getDomains()[0];
        }

-        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . implode('/', $parameters);
+        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower((string)$method) . implode('/', $parameters);

        return '/' . trim($url, '/') . '/';
    }

    public function matchRoute(string $url, Request $request): bool
    {
-        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+        if ($this->matchGroup($url, $request) === false) {
            return false;
        }

@@ -12,6 +12,7 @@ class RouteGroup extends Route implements IGroupRoute
    protected $name;
    protected $domains = [];
    protected $exceptionHandlers = [];
+    protected $mergeExceptionHandlers = true;

    /**
     * Method called to check if a domain matches
@@ -36,6 +37,7 @@ class RouteGroup extends Route implements IGroupRoute

            if ($parameters !== null && count($parameters) !== 0) {
                $this->parameters = $parameters;
+
                return true;
            }
        }
@@ -72,11 +74,11 @@ class RouteGroup extends Route implements IGroupRoute
        $parsedPrefix = $this->prefix;

        foreach ($this->getParameters() as $parameter => $value) {
-            $parsedPrefix = str_ireplace('{' . $parameter . '}', $value, $parsedPrefix);
+            $parsedPrefix = str_ireplace('{' . $parameter . '}', (string)$value, (string)$parsedPrefix);
        }

        /* Skip if prefix doesn't match */
-        if ($this->prefix !== null && stripos($url, $parsedPrefix) === false) {
+        if ($this->prefix !== null && stripos($url, rtrim($parsedPrefix, '/') . '/') === false) {
            return false;
        }

@@ -153,6 +155,17 @@ class RouteGroup extends Route implements IGroupRoute
        return $this;
    }

+    /**
+     * Prepends prefix while ensuring that the url has the correct formatting.
+     *
+     * @param string $url
+     * @return static
+     */
+    public function prependPrefix(string $url): IGroupRoute
+    {
+        return $this->setPrefix(rtrim($url, '/') . $this->prefix);
+    }
+
    /**
     * Set prefix that child-routes will inherit.
     *
@@ -163,6 +176,29 @@ class RouteGroup extends Route implements IGroupRoute
        return $this->prefix;
    }

+    /**
+     * When enabled group will overwrite any existing exception-handlers.
+     *
+     * @param bool $merge
+     * @return static
+     */
+    public function setMergeExceptionHandlers(bool $merge): IGroupRoute
+    {
+        $this->mergeExceptionHandlers = $merge;
+
+        return $this;
+    }
+
+    /**
+     * Returns true if group should overwrite existing exception-handlers.
+     *
+     * @return bool
+     */
+    public function getMergeExceptionHandlers(): bool
+    {
+        return $this->mergeExceptionHandlers;
+    }
+
    /**
     * Merge with information from another route.
     *
@@ -172,11 +208,14 @@ class RouteGroup extends Route implements IGroupRoute
     */
    public function setSettings(array $settings, bool $merge = false): IRoute
    {
-
        if (isset($settings['prefix']) === true) {
            $this->setPrefix($settings['prefix'] . $this->prefix);
        }

+        if (isset($settings['mergeExceptionHandlers']) === true) {
+            $this->setMergeExceptionHandlers($settings['mergeExceptionHandlers']);
+        }
+
        if ($merge === false && isset($settings['exceptionHandler']) === true) {
            $this->setExceptionHandlers((array)$settings['exceptionHandler']);
        }
@@ -1,8 +1,4 @@
 <?php
-/**
- * @deprecated This class is deprecated and will be removed in future versions.
- * @see \Pecee\SimpleRouter\Route\RouteGroup
- */
 namespace Pecee\SimpleRouter\Route;

 class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
@@ -54,7 +54,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute

        /* Remove method/type */
        if (strpos($name, '.') !== false) {
-            $name = (string)substr($name, 0, strrpos($name, '.'));
+            $name = substr($name, 0, strrpos($name, '.'));
        }

        return (strtolower($this->name) === strtolower($name));
@@ -68,7 +68,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     */
    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
-        $url = array_search($name, $this->names, false);
+        $url = array_search($name, $this->names, true);
        if ($url !== false) {
            return rtrim($this->url . $this->urls[$url], '/') . '/';
        }
@@ -85,7 +85,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute

    public function matchRoute(string $url, Request $request): bool
    {
-        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+        if ($this->matchGroup($url, $request) === false) {
            return false;
        }

@@ -106,7 +106,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
            return false;
        }

-        $action = strtolower(trim($this->parameters['action']));
+        $action = strtolower(trim((string)$this->parameters['action']));
        $id = $this->parameters['id'];

        // Remove action parameter
@@ -6,7 +6,12 @@ use Pecee\Http\Request;

 class RouteUrl extends LoadableRoute
 {
-    public function __construct($url, $callback)
+    /**
+     * RouteUrl constructor.
+     * @param string $url
+     * @param \Closure|string $callback
+     */
+    public function __construct(string $url, $callback)
    {
        $this->setUrl($url);
        $this->setCallback($callback);
@@ -35,6 +35,12 @@ class Router
     * @var bool
     */
    protected $isProcessingRoute;
+    
+    /**
+     * Defines all data from current processing route.
+     * @var ILoadableRoute
+     */
+    protected $currentProcessingRoute;

    /**
     * All added routes
@@ -44,7 +50,7 @@ class Router

    /**
     * List of processed routes
-     * @var array
+     * @var array|ILoadableRoute[]
     */
    protected $processedRoutes = [];

@@ -63,7 +69,7 @@ class Router

    /**
     * Csrf verifier class
-     * @var BaseCsrfVerifier
+     * @var BaseCsrfVerifier|null
     */
    protected $csrfVerifier;

@@ -107,7 +113,7 @@ class Router

    /**
     * Class loader instance
-     * @var ClassLoader
+     * @var IClassLoader
     */
    protected $classLoader;

@@ -160,7 +166,8 @@ class Router
    public function addRoute(IRoute $route): IRoute
    {
        $this->fireEvents(EventHandler::EVENT_ADD_ROUTE, [
-            'route' => $route,
+            'route'      => $route,
+            'isSubRoute' => $this->isProcessingRoute,
        ]);

        /*
@@ -184,7 +191,6 @@ class Router
     */
    protected function renderAndProcess(IRoute $route): void
    {
-
        $this->isProcessingRoute = true;
        $route->renderRoute($this->request, $this);
        $this->isProcessingRoute = false;
@@ -203,7 +209,7 @@ class Router
    /**
     * Process added routes.
     *
-     * @param array $routes
+     * @param array|IRoute[] $routes
     * @param IGroupRoute|null $group
     * @throws NotFoundHttpException
     */
@@ -211,11 +217,8 @@ class Router
    {
        $this->debug('Processing routes');

-        // Loop through each route-request
-        $exceptionHandlers = [];
-
        // Stop processing routes if no valid route is found.
-        if ($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
+        if ($this->request->getRewriteRoute() === null && $this->request->getUrl()->getOriginalUrl() === '') {
            $this->debug('Halted route-processing as no valid route was found');

            return;
@@ -223,7 +226,7 @@ class Router

        $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();

-        /* @var $route IRoute */
+        // Loop through each route-request
        foreach ($routes as $route) {

            $this->debug('Processing route "%s"', get_class($route));
@@ -240,13 +243,22 @@ class Router

                    /* Add exception handlers */
                    if (count($route->getExceptionHandlers()) !== 0) {
-                        /** @noinspection AdditionOperationOnArraysInspection */
-                        $exceptionHandlers += $route->getExceptionHandlers();
+
+                        if ($route->getMergeExceptionHandlers() === true) {
+
+                            foreach ($route->getExceptionHandlers() as $handler) {
+                                $this->exceptionHandlers[] = $handler;
+                            }
+
+                        } else {
+                            $this->exceptionHandlers = $route->getExceptionHandlers();
+                        }
                    }

                    /* Only render partial group if it matches */
                    if ($route instanceof IPartialGroupRoute === true) {
                        $this->renderAndProcess($route);
+                        continue;
                    }

                }
@@ -264,8 +276,6 @@ class Router
                $this->processedRoutes[] = $route;
            }
        }
-
-        $this->exceptionHandlers = array_merge($exceptionHandlers, $this->exceptionHandlers);
    }

    /**
@@ -367,6 +377,9 @@ class Router
            foreach ($this->processedRoutes as $key => $route) {

                $this->debug('Matching route "%s"', get_class($route));
+                
+                /* Add current processing route to constants */
+                $this->currentProcessingRoute = $route;

                /* If the route matches */
                if ($route->matchRoute($url, $this->request) === true) {
@@ -509,7 +522,7 @@ class Router
        ]);

        /* @var $handler IExceptionHandler */
-        foreach ($this->exceptionHandlers as $key => $handler) {
+        foreach (array_reverse($this->exceptionHandlers) as $key => $handler) {

            if (is_object($handler) === false) {
                $handler = new $handler();
@@ -575,7 +588,6 @@ class Router
            'name' => $name,
        ]);

-        /* @var $route ILoadableRoute */
        foreach ($this->processedRoutes as $route) {

            /* Check if the name matches with a name on the route. Should match either router alias or controller alias. */
@@ -593,10 +605,10 @@ class Router
            }

            /* Using @ is most definitely a controller@method or alias@method */
-            if (is_string($name) === true && strpos($name, '@') !== false) {
+            if (strpos($name, '@') !== false) {
                [$controller, $method] = array_map('strtolower', explode('@', $name));

-                if ($controller === strtolower($route->getClass()) && $method === strtolower($route->getMethod())) {
+                if ($controller === strtolower((string)$route->getClass()) && $method === strtolower((string)$route->getMethod())) {
                    $this->debug('Found route "%s" by controller "%s" and method "%s"', $route->getUrl(), $controller, $method);

                    return $route;
@@ -605,7 +617,7 @@ class Router

            /* Check if callback matches (if it's not a function) */
            $callback = $route->getCallback();
-            if (is_string($name) === true && is_string($callback) === true && is_callable($callback) === false && strpos($name, '@') !== false && strpos($callback, '@') !== false) {
+            if (is_string($callback) === true && is_callable($callback) === false && strpos($name, '@') !== false && strpos($callback, '@') !== false) {

                /* Check if the entire callback is matching */
                if (strpos($callback, $name) === 0 || strtolower($callback) === strtolower($name)) {
@@ -656,10 +668,6 @@ class Router
            'getParams'  => $getParams,
        ]);

-        if ($getParams !== null && is_array($getParams) === false) {
-            throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
-        }
-
        if ($name === '' && $parameters === '') {
            return new Url('/');
        }
@@ -684,7 +692,7 @@ class Router
                ->setParams($getParams);
        }

-        if($name !== null) {
+        if ($name !== null) {
            /* We try to find a match on the given name */
            $route = $this->findRoute($name);

@@ -703,21 +711,21 @@ class Router
            /* Loop through all the routes to see if we can find a match */

            /* @var $route ILoadableRoute */
-            foreach ($this->processedRoutes as $route) {
+            foreach ($this->processedRoutes as $processedRoute) {

                /* Check if the route contains the name/alias */
-                if ($route->hasName($controller) === true) {
+                if ($processedRoute->hasName($controller) === true) {
                    return $this->request
                        ->getUrlCopy()
-                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setPath($processedRoute->findUrl($method, $parameters, $name))
                        ->setParams($getParams);
                }

                /* Check if the route controller is equal to the name */
-                if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($controller)) {
+                if ($processedRoute instanceof IControllerRoute && strtolower($processedRoute->getController()) === strtolower($controller)) {
                    return $this->request
                        ->getUrlCopy()
-                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setPath($processedRoute->findUrl($method, $parameters, $name))
                        ->setParams($getParams);
                }

@@ -842,7 +850,7 @@ class Router
    /**
     * Get class loader
     *
-     * @return ClassLoader
+     * @return IClassLoader
     */
    public function getClassLoader(): IClassLoader
    {
@@ -928,6 +936,16 @@ class Router
    {
        return $this->debugList;
    }
+    
+    /**
+     * Get the current processing route details.
+     *
+     * @return ILoadableRoute
+     */
+    public function getCurrentProcessingRoute(): ILoadableRoute
+    {
+        return $this->currentProcessingRoute;
+    }

    /**
     * Changes the rendering behavior of the router.
@@ -944,4 +962,11 @@ class Router
        return $this;
    }

-}
+    public function addExceptionHandler(IExceptionHandler $handler): self
+    {
+        $this->exceptionHandlers[] = $handler;
+
+        return $this;
+    }
+
+}
@@ -4,8 +4,8 @@
 * Router helper class
 * ---------------------------
 *
- * This class is added so calls can be made statically like Router::get() making the code look pretty.
- * It also adds some extra functionality like default-namespace.
+ * This class is added so calls can be made statically like SimpleRouter::get() making the code look pretty.
+ * It also adds some extra functionality like default-namespace etc.
 */

 namespace Pecee\SimpleRouter;
@@ -22,6 +22,7 @@ use Pecee\SimpleRouter\Exceptions\HttpException;
 use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
 use Pecee\SimpleRouter\Handlers\IEventHandler;
 use Pecee\SimpleRouter\Route\IGroupRoute;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
 use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
 use Pecee\SimpleRouter\Route\RouteController;
@@ -173,7 +174,7 @@ class SimpleRouter
     */
    public static function redirect(string $where, string $to, int $httpCode = 301): IRoute
    {
-        return static::get($where, function () use ($to, $httpCode) {
+        return static::get($where, static function () use ($to, $httpCode): void {
            static::response()->redirect($to, $httpCode);
        });
    }
@@ -185,7 +186,7 @@ class SimpleRouter
     * @param string|array|Closure $callback
     * @param array|null $settings
     *
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function get(string $url, $callback, array $settings = null): IRoute
    {
@@ -198,7 +199,7 @@ class SimpleRouter
     * @param string $url
     * @param string|array|Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function post(string $url, $callback, array $settings = null): IRoute
    {
@@ -211,7 +212,7 @@ class SimpleRouter
     * @param string $url
     * @param string|array|Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function put(string $url, $callback, array $settings = null): IRoute
    {
@@ -224,7 +225,7 @@ class SimpleRouter
     * @param string $url
     * @param string|array|Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function patch(string $url, $callback, array $settings = null): IRoute
    {
@@ -237,7 +238,7 @@ class SimpleRouter
     * @param string $url
     * @param string|array|Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function options(string $url, $callback, array $settings = null): IRoute
    {
@@ -250,7 +251,7 @@ class SimpleRouter
     * @param string $url
     * @param string|array|Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function delete(string $url, $callback, array $settings = null): IRoute
    {
@@ -262,15 +263,11 @@ class SimpleRouter
     *
     * @param array $settings
     * @param Closure $callback
-     * @return RouteGroup
+     * @return RouteGroup|IGroupRoute
     * @throws InvalidArgumentException
     */
    public static function group(array $settings, Closure $callback): IGroupRoute
    {
-        if (is_callable($callback) === false) {
-            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
-        }
-
        $group = new RouteGroup();
        $group->setCallback($callback);
        $group->setSettings($settings);
@@ -287,15 +284,11 @@ class SimpleRouter
     * @param string $url
     * @param Closure $callback
     * @param array $settings
-     * @return RoutePartialGroup
+     * @return RoutePartialGroup|IPartialGroupRoute
     * @throws InvalidArgumentException
     */
    public static function partialGroup(string $url, Closure $callback, array $settings = []): IPartialGroupRoute
    {
-        if (is_callable($callback) === false) {
-            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
-        }
-
        $settings['prefix'] = $url;

        $group = new RoutePartialGroup();
@@ -313,7 +306,7 @@ class SimpleRouter
     * @param string $url
     * @param string|array|Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     * @see SimpleRouter::form
     */
    public static function basic(string $url, $callback, array $settings = null): IRoute
@@ -328,7 +321,7 @@ class SimpleRouter
     * @param string $url
     * @param string|array|Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     * @see SimpleRouter::form
     */
    public static function form(string $url, $callback, array $settings = null): IRoute
@@ -348,7 +341,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteUrl|IRoute
     */
-    public static function match(array $requestMethods, string $url, $callback, array $settings = null)
+    public static function match(array $requestMethods, string $url, $callback, array $settings = null): IRoute
    {
        $route = new RouteUrl($url, $callback);
        $route->setRequestMethods($requestMethods);
@@ -368,7 +361,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteUrl|IRoute
     */
-    public static function all(string $url, $callback, array $settings = null)
+    public static function all(string $url, $callback, array $settings = null): IRoute
    {
        $route = new RouteUrl($url, $callback);

@@ -387,7 +380,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteController|IRoute
     */
-    public static function controller(string $url, string $controller, array $settings = null)
+    public static function controller(string $url, string $controller, array $settings = null): IRoute
    {
        $route = new RouteController($url, $controller);

@@ -406,7 +399,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteResource|IRoute
     */
-    public static function resource(string $url, string $controller, array $settings = null)
+    public static function resource(string $url, string $controller, array $settings = null): IRoute
    {
        $route = new RouteResource($url, $controller);

@@ -425,16 +418,9 @@ class SimpleRouter
     */
    public static function error(Closure $callback): CallbackExceptionHandler
    {
-        $routes = static::router()->getRoutes();
-
        $callbackHandler = new CallbackExceptionHandler($callback);

-        $group = new RouteGroup();
-        $group->addExceptionHandler($callbackHandler);
-
-        array_unshift($routes, $group);
-
-        static::router()->setRoutes($routes);
+        static::router()->addExceptionHandler($callbackHandler);

        return $callbackHandler;
    }
@@ -506,26 +492,13 @@ class SimpleRouter
    /**
     * Prepends the default namespace to all new routes added.
     *
-     * @param IRoute $route
+     * @param ILoadableRoute|IRoute $route
     * @return IRoute
     */
    public static function addDefaultNamespace(IRoute $route): IRoute
    {
        if (static::$defaultNamespace !== null) {
-
-            $ns = static::$defaultNamespace;
-            $namespace = $route->getNamespace();
-
-            if ($namespace !== null) {
-                // Don't overwrite namespaces that starts with \
-                if ($namespace[0] !== '\\') {
-                    $ns .= '\\' . $namespace;
-                } else {
-                    $ns = $namespace;
-                }
-            }
-
-            $route->setNamespace($ns);
+            $route->setNamespace(static::$defaultNamespace);
        }

        return $route;
@@ -0,0 +1,66 @@
+<?php
+require_once 'Dummy/CsrfVerifier/DummyCsrfVerifier.php';
+require_once 'Dummy/Security/SilentTokenProvider.php';
+
+class CsrfVerifierTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testTokenPass()
+    {
+        global $_POST;
+
+        $tokenProvider = new SilentTokenProvider();
+
+        $_POST[DummyCsrfVerifier::POST_KEY] = $tokenProvider->getToken();
+
+        TestRouter::router()->reset();
+
+        $router = TestRouter::router();
+        $router->getRequest()->setMethod(\Pecee\Http\Request::REQUEST_TYPE_POST);
+        $router->getRequest()->setUrl(new \Pecee\Http\Url('/page'));
+        $csrf = new DummyCsrfVerifier();
+        $csrf->setTokenProvider($tokenProvider);
+
+        $csrf->handle($router->getRequest());
+
+        // If handle doesn't throw exception, the test has passed
+        $this->assertTrue(true);
+    }
+
+    public function testTokenFail()
+    {
+        $this->expectException(\Pecee\Http\Middleware\Exceptions\TokenMismatchException::class);
+
+        global $_POST;
+
+        $tokenProvider = new SilentTokenProvider();
+
+        $router = TestRouter::router();
+        $router->getRequest()->setMethod(\Pecee\Http\Request::REQUEST_TYPE_POST);
+        $router->getRequest()->setUrl(new \Pecee\Http\Url('/page'));
+        $csrf = new DummyCsrfVerifier();
+        $csrf->setTokenProvider($tokenProvider);
+
+        $csrf->handle($router->getRequest());
+    }
+
+    public function testExcludeInclude()
+    {
+        $router = TestRouter::router();
+        $csrf = new DummyCsrfVerifier();
+        $request = $router->getRequest();
+
+        $request->setUrl(new \Pecee\Http\Url('/exclude-page'));
+        $this->assertTrue($csrf->testSkip($router->getRequest()));
+
+        $request->setUrl(new \Pecee\Http\Url('/exclude-all/page'));
+        $this->assertTrue($csrf->testSkip($router->getRequest()));
+
+        $request->setUrl(new \Pecee\Http\Url('/exclude-all/include-page'));
+        $this->assertFalse($csrf->testSkip($router->getRequest()));
+
+        $request->setUrl(new \Pecee\Http\Url('/include-page'));
+        $this->assertFalse($csrf->testSkip($router->getRequest()));
+    }
+
+}
@@ -0,0 +1,71 @@
+<?php
+
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Middleware/IpRestrictMiddleware.php';
+
+class CustomMiddlewareTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testIpBlock() {
+
+        $this->expectException(\Pecee\SimpleRouter\Exceptions\HttpException::class);
+
+        global $_SERVER;
+
+        // Test exact ip
+
+        $_SERVER['remote-addr'] = '5.5.5.5';
+
+        TestRouter::group(['middleware' => IpRestrictMiddleware::class], function() {
+            TestRouter::get('/fail', 'DummyController@method1');
+        });
+
+        TestRouter::debug('/fail');
+
+        // Test ip-range
+
+        $_SERVER['remote-addr'] = '8.8.4.4';
+
+        TestRouter::router()->reset();
+
+        TestRouter::group(['middleware' => IpRestrictMiddleware::class], function() {
+            TestRouter::get('/fail', 'DummyController@method1');
+        });
+
+        TestRouter::debug('/fail');
+
+    }
+
+    public function testIpSuccess() {
+
+        global $_SERVER;
+
+        // Test ip that is not blocked
+
+        $_SERVER['remote-addr'] = '6.6.6.6';
+
+        TestRouter::router()->reset();
+
+        TestRouter::group(['middleware' => IpRestrictMiddleware::class], function() {
+            TestRouter::get('/success', 'DummyController@method1');
+        });
+
+        TestRouter::debug('/success');
+
+        // Test ip in whitelist
+
+        $_SERVER['remote-addr'] = '8.8.2.2';
+
+        TestRouter::router()->reset();
+
+        TestRouter::group(['middleware' => IpRestrictMiddleware::class], function() {
+            TestRouter::get('/success', 'DummyController@method1');
+        });
+
+        TestRouter::debug('/success');
+
+        $this->assertTrue(true);
+
+    }
+
+}
@@ -16,11 +16,11 @@ class CustomClassLoader implements \Pecee\SimpleRouter\ClassLoader\IClassLoader
     */
    public function loadClassMethod($class, string $method, array $parameters)
    {
-        return call_user_func_array([$class, $method], ['result' => true]);
+        return call_user_func_array([$class, $method], [true]);
    }

    public function loadClosure(callable $closure, array $parameters)
    {
-        return call_user_func_array($closure, ['result' => true]);
+        return call_user_func_array($closure, [true]);
    }
 }
@@ -0,0 +1,18 @@
+<?php
+
+class DummyCsrfVerifier extends \Pecee\Http\Middleware\BaseCsrfVerifier {
+
+    protected $except = [
+        '/exclude-page',
+        '/exclude-all/*',
+    ];
+
+    protected $include = [
+        '/exclude-all/include-page',
+    ];
+
+    public function testSkip(\Pecee\Http\Request $request) {
+        return $this->skip($request);
+    }
+
+}
@@ -0,0 +1,14 @@
+<?php
+
+class IpRestrictMiddleware extends \Pecee\Http\Middleware\IpRestrictAccess {
+
+    protected $ipBlacklist = [
+        '5.5.5.5',
+        '8.8.*',
+    ];
+
+    protected $ipWhitelist = [
+        '8.8.2.2',
+    ];
+
+}
@@ -0,0 +1,11 @@
+<?php
+namespace MyNamespace;
+
+class NSController {
+
+    public function method()
+    {
+        return true;
+    }
+
+}
@@ -103,4 +103,49 @@ class EventHandlerTest extends \PHPUnit\Framework\TestCase

    }

+    public function testCustomBasePath() {
+
+        $basePath = '/basepath/';
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ADD_ROUTE, function(EventArgument $data) use($basePath) {
+
+            // Skip routes added by group
+            if($data->isSubRoute === false) {
+
+                switch (true) {
+                    case $data->route instanceof \Pecee\SimpleRouter\Route\ILoadableRoute:
+                        $data->route->prependUrl($basePath);
+                        break;
+                    case $data->route instanceof \Pecee\SimpleRouter\Route\IGroupRoute:
+                        $data->route->prependPrefix($basePath);
+                        break;
+
+                }
+            }
+
+        });
+
+        $results = [];
+
+        TestRouter::addEventHandler($eventHandler);
+
+        TestRouter::get('/about', function() use(&$results) {
+            $results[] = 'about';
+        });
+
+        TestRouter::group(['prefix' => '/admin'], function() use(&$results) {
+            TestRouter::get('/', function() use(&$results) {
+                $results[] = 'admin';
+            });
+        });
+
+        TestRouter::router()->setRenderMultipleRoutes(false);
+        TestRouter::debugNoReset('/basepath/about');
+        TestRouter::debugNoReset('/basepath/admin');
+
+        $this->assertEquals(['about', 'admin'], $results);
+
+    }
+
 }
@@ -19,10 +19,29 @@ class RouterCallbackExceptionHandlerTest extends \PHPUnit\Framework\TestCase
            throw new ExceptionHandlerException();
        });

-        TestRouter::debugNoReset('/404-url', 'get');
-        TestRouter::router()->reset();
+        TestRouter::debug('/404-url');
+    }

-        $this->assertTrue(true);
+    public function testExceptionHandlerCallback() {
+
+        TestRouter::group(['prefix' => null], function() {
+            TestRouter::get('/', function() {
+                return 'Hello world';
+            });
+
+            TestRouter::get('/not-found', 'DummyController@method1');
+            TestRouter::error(function(\Pecee\Http\Request $request, \Exception $exception) {
+
+                if($exception instanceof \Pecee\SimpleRouter\Exceptions\NotFoundHttpException && $exception->getCode() === 404) {
+                    return $request->setRewriteCallback(static function() {
+                        return 'success';
+                    });
+                }
+            });
+        });
+
+        $result = TestRouter::debugOutput('/thisdoes-not/existssss', 'get');
+        $this->assertEquals('success', $result);
    }

 }
@@ -3,20 +3,20 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';

-class GroupTest extends \PHPUnit\Framework\TestCase
+class RouterGroupTest extends \PHPUnit\Framework\TestCase
 {

    public function testGroupLoad()
    {
        $result = false;

-        TestRouter::group(['prefix' => '/group'], function () use(&$result) {
+        TestRouter::group(['prefix' => '/group'], function () use (&$result) {
            $result = true;
        });

        try {
            TestRouter::debug('/', 'get');
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {

        }
        $this->assertTrue($result);
@@ -81,4 +81,40 @@ class GroupTest extends \PHPUnit\Framework\TestCase

    }

+    public function testNamespaceExtend()
+    {
+        TestRouter::group(['namespace' => '\My\Namespace'], function () use (&$result) {
+
+            TestRouter::group(['namespace' => 'Service'], function () use (&$result) {
+
+                TestRouter::get('/test', function () use (&$result) {
+                    return \Pecee\SimpleRouter\SimpleRouter::router()->getRequest()->getLoadedRoute()->getNamespace();
+                });
+
+            });
+
+        });
+
+        $namespace = TestRouter::debugOutput('/test');
+        $this->assertEquals('\My\Namespace\Service', $namespace);
+    }
+
+    public function testNamespaceOverwrite()
+    {
+        TestRouter::group(['namespace' => '\My\Namespace'], function () use (&$result) {
+
+            TestRouter::group(['namespace' => '\Service'], function () use (&$result) {
+
+                TestRouter::get('/test', function () use (&$result) {
+                    return \Pecee\SimpleRouter\SimpleRouter::router()->getRequest()->getLoadedRoute()->getNamespace();
+                });
+
+            });
+
+        });
+
+        $namespace = TestRouter::debugOutput('/test');
+        $this->assertEquals('\Service', $namespace);
+    }
+
 }
@@ -33,9 +33,9 @@ class RouterRewriteTest extends \PHPUnit\Framework\TestCase
        global $stack;
        $stack = [];

-        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () use ($stack) {
+        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {

-            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () use ($stack) {
+            TestRouter::group(['prefix' => '/test', 'exceptionHandler' => ExceptionHandlerThird::class], function () {

                TestRouter::get('/my-path', 'DummyController@method1');

@@ -43,21 +43,48 @@ class RouterRewriteTest extends \PHPUnit\Framework\TestCase
        });

        try {
-            TestRouter::debug('/my-non-existing-path', 'get');
+            TestRouter::debug('/test/non-existing', 'get');
        } catch (\ResponseException $e) {

        }

        $expectedStack = [
-            ExceptionHandlerFirst::class,
-            ExceptionHandlerSecond::class,
            ExceptionHandlerThird::class,
+            ExceptionHandlerSecond::class,
+            ExceptionHandlerFirst::class,
        ];

        $this->assertEquals($expectedStack, $stack);

    }

+    public function testStopMergeExceptionHandlers()
+    {
+        global $stack;
+        $stack = [];
+
+        TestRouter::group(['prefix' => '/', 'exceptionHandler' => ExceptionHandlerFirst::class], function () {
+
+            TestRouter::group(['prefix' => '/admin', 'exceptionHandler' => ExceptionHandlerSecond::class, 'mergeExceptionHandlers' => false], function () {
+
+                TestRouter::get('/my-path', 'DummyController@method1');
+
+            });
+        });
+
+        try {
+            TestRouter::debug('/admin/my-path-test', 'get');
+        } catch (\Pecee\SimpleRouter\Exceptions\NotFoundHttpException $e) {
+
+        }
+
+        $expectedStack = [
+            ExceptionHandlerSecond::class,
+        ];
+
+        $this->assertEquals($expectedStack, $stack);
+    }
+
    public function testRewriteExceptionMessage()
    {
        $this->expectException(\Pecee\SimpleRouter\Exceptions\NotFoundHttpException::class);
@@ -2,6 +2,7 @@

 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
+require_once 'Dummy/NSController.php';
 require_once 'Dummy/Exception/ExceptionHandlerException.php';

 class RouterRouteTest extends \PHPUnit\Framework\TestCase
@@ -174,6 +175,70 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase

        TestRouter::debug('/test', 'get');

+        $this->assertFalse($result);
+
+    }    
+    
+    public function testFixedSubdomainDynamicDomain()
+    {
+        TestRouter::request()->setHost('other.world.com');
+
+        $result = false;
+
+        TestRouter::group(['domain' => 'other.{domain}'], function () use (&$result) {
+            TestRouter::get('/test', function ($domain = null) use (&$result) {
+
+                $result = true;
+            });
+        });
+
+        TestRouter::debug('/test', 'get');
+
+        $this->assertTrue($result);
+
+    }
+
+    public function testFixedSubdomainDynamicDomainParameter()
+    {
+        TestRouter::request()->setHost('other.world.com');
+
+        $result = false;
+
+        TestRouter::group(['domain' => 'other.{domain}'], function () use (&$result) {
+            TestRouter::get('/test', 'DummyController@param');
+            TestRouter::get('/test/{key}', 'DummyController@param');
+        });
+
+        $response = TestRouter::debugOutputNoReset('/test', 'get');
+
+        $this->assertEquals('world.com', $response);
+
+        $response = TestRouter::debugOutput('/test/unittest', 'get');
+
+        $this->assertEquals('unittest, world.com', $response);
+
+    }
+
+    public function testWrongFixedSubdomainDynamicDomain()
+    {
+        TestRouter::request()->setHost('wrong.world.com');
+
+        $result = false;
+
+        TestRouter::group(['domain' => 'other.{domain}'], function () use (&$result) {
+            TestRouter::get('/test', function ($domain = null) use (&$result) {
+
+                $result = true;
+            });
+        });
+
+        try {
+            TestRouter::debug('/test', 'get');
+        } catch(\Exception $e) {
+
+        }
+
+
        $this->assertFalse($result);

    }
@@ -246,6 +311,16 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
        $this->assertTrue(true);
    }

+    public function testDefaultNameSpaceOverload()
+    {
+        TestRouter::setDefaultNamespace('DefaultNamespace\\Controllers');
+        TestRouter::get('/test', [\MyNamespace\NSController::class, 'method']);
+
+        $result = TestRouter::debugOutput('/test');
+
+        $this->assertTrue( (bool)$result);
+    }
+
    public function testSameRoutes()
    {
        TestRouter::get('/recipe', 'DummyController@method1')->name('add');
@@ -181,6 +181,22 @@ class RouterUrlTest extends \PHPUnit\Framework\TestCase

        $output = TestRouter::debugOutput('/admin/asd/bec/123', 'get');
        $this->assertEquals('match', $output);
+
+        TestRouter::router()->reset();
+    }
+
+    public function testCustomRegexWithParameter()
+    {
+        TestRouter::request()->setHost('google.com');
+
+        $results = '';
+
+        TestRouter::get('/tester/{param}', function ($param = null) use($results) {
+            return $results = $param;
+        })->setMatch('/(.*)/i');
+
+        $output = TestRouter::debugOutput('/tester/abepik/ko');
+        $this->assertEquals('/tester/abepik/ko/', $output);
    }

    public function testRenderMultipleRoutesDisabled()
@@ -8,7 +8,7 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
        static::request()->setHost('testhost.com');
    }

-    public static function debugNoReset($testUrl, $testMethod = 'get')
+    public static function debugNoReset(string $testUrl, string $testMethod = 'get'): void
    {
        $request = static::request();

@@ -18,22 +18,24 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
        static::start();
    }

-    public static function debug($testUrl, $testMethod = 'get', bool $reset = true)
+    public static function debug(string $testUrl, string $testMethod = 'get', bool $reset = true): void
    {
        try {
            static::debugNoReset($testUrl, $testMethod);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
+            static::$defaultNamespace = null;
            static::router()->reset();
            throw $e;
        }

-        if($reset === true) {
+        if ($reset === true) {
+            static::$defaultNamespace = null;
            static::router()->reset();
        }

    }

-    public static function debugOutput($testUrl, $testMethod = 'get', bool $reset = true)
+    public static function debugOutput(string $testUrl, string $testMethod = 'get', bool $reset = true): string
    {
        $response = null;

@@ -46,4 +48,17 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
        return $response;
    }

+    public static function debugOutputNoReset(string $testUrl, string $testMethod = 'get', bool $reset = true): string
+    {
+        $response = null;
+
+        // Route request
+        ob_start();
+        static::debugNoReset($testUrl, $testMethod, $reset);
+        $response = ob_get_clean();
+
+        // Return response
+        return $response;
+    }
+
 }
Author	SHA1	Message	Date
Simon Sessingø	9c66a4dfd8	Merge pull request #630 from skipperbent/v5-development Version 5.0.0.2	2023-02-11 17:34:48 +01:00
sessingo	941149d8d7	Fixed deprication warnings	2023-02-11 17:31:00 +01:00
sessingo	1764b67112	Updated composer.json	2023-02-11 17:25:54 +01:00
sessingo	3742998537	Updated git workflows	2023-02-11 17:22:40 +01:00
sessingo	20e00efbed	Php8 deprication warning	2023-02-11 17:16:40 +01:00
sessingo	7dd176a771	Fixed strtolower php8 deprication warning	2023-02-10 22:47:45 +01:00
sessingo	abda9d468b	Fixed deprication message when using response()->json	2023-02-10 08:48:58 +01:00
sessingo	23a29ce5d1	Fixed php strtolower deprication warning	2023-02-10 06:10:29 +01:00
Simon Sessingø	d5bf77cbd4	Merge pull request #628 from skipperbent/v5-development Fixed offsetGet return type deprication warning	2023-02-09 03:34:48 +01:00
sessingo	e34fe47a04	Fixed offsetGet return type deprication warning	2023-02-09 03:29:41 +01:00
Simon Sessingø	1e9fa9c6a1	Merge pull request #627 from skipperbent/v4-development Version 5.0.0.0	2023-02-09 03:07:54 +01:00
sessingo	f0a4b6e46f	Updated composer	2023-02-09 03:01:17 +01:00
Simon Sessingø	e38a406957	Merge pull request #594 from redoonetworks/dymanic-domain Dynamic domain, fixed Subdomain	2023-02-09 02:32:18 +01:00
Simon Sessingø	0630569f56	Merge pull request #592 from skipperbent/master fixed json_encode 2nd parameter int flag issue in response and issue with offsetGet return type incompatibility	2023-02-09 02:30:02 +01:00
Simon Sessingø	b82e29c864	Merge pull request #614 from DeveloperMarius/non-ascii-chars-urlencoding urlencoding issue with non-ASCII chars in request-uri header	2023-02-09 02:29:25 +01:00
Simon Sessingø	9c79901316	Merge pull request #604 from xJuvi/xJuvi-patch-1 Make current processing rule accessible	2023-02-09 02:28:34 +01:00
Simon Sessingø	fbc87cc9bd	Merge pull request #589 from mauroagr/patch-1 Update in error status code	2023-02-09 02:26:36 +01:00
DeveloperMarius	301c2cfe4a	fixed urldecode request-uri header	2022-03-01 15:39:31 +01:00
Hannes	01bad94af0	Update Router.php	2022-02-02 15:20:23 +01:00
Hannes	a1d5f38af7	Add function to fetch currect processing route	2022-01-02 21:59:39 +01:00
Hannes	b5e42dbdfb	Make current processing rule accessible Adds an constant with the data from the current processing rule to make it globally accessible, f.e. in middleware objects	2022-01-02 14:42:43 +01:00
Stefan Warnat	06a63eb0e7	Fix Typo	2021-10-04 02:02:45 +02:00
Stefan Warnat	5268a998ff	Extend domain filter to support fixed subdomain and domain parameter	2021-10-04 01:49:42 +02:00
Stefan Warnat	9fa7ad3e91	implement test Function to test output without reset	2021-10-04 01:49:00 +02:00
Mauro Tschiedel	0097725ef2	Update in error status code Add example If you will add specific status code for the browser	2021-09-01 08:22:12 -03:00
Simon Sessingø	749f252ffb	Merge pull request #584 from skipperbent/v4-release V4 release	2021-07-18 01:45:46 +02:00
Simon Sessingø	032a2ae7e0	Merge pull request #583 from skipperbent/v4-development Version 4.3.7.2	2021-07-18 01:45:36 +02:00
Simon Sessingø	c2e2d3bb5d	Merge pull request #582 from skipperbent/v4-group-prefix-bug Fixed issue causing group prefix to trigger on paths without "/" (issue #573 - thanks @Venloress)	2021-07-18 01:44:57 +02:00
Simon Sessingø	5dd0690009	Fixed issue causing group prefix to trigger on paths without "/" (issue #573 - thanks @Venloress).	2021-07-18 01:41:26 +02:00
Simon Sessingø	dbcf8f19a3	Merge pull request #581 from skipperbent/v4-release V4 release	2021-07-17 22:01:09 +02:00
Simon Sessingø	ee61eda1e8	Merge pull request #580 from skipperbent/v4-development Updated documentation	2021-07-17 22:00:22 +02:00
Simon Sessingø	471bbe137f	Updated documentation	2021-07-17 21:59:23 +02:00
Simon Sessingø	b08dea9da5	Merge pull request #579 from skipperbent/v4-release V4 release	2021-07-17 21:57:11 +02:00
Simon Sessingø	b17ba06a8c	Merge pull request #578 from skipperbent/v4-development Version 4.3.7.0	2021-07-17 21:56:47 +02:00
Simon Sessingø	69494265a5	Merge pull request #577 from skipperbent/v4-prevent-merge-attribute Added group attribute to stop router from merging exception-handlers (issue: #573)	2021-07-17 21:54:07 +02:00
Simon Sessingø	0d8915b206	Fixed return type.	2021-07-17 21:52:00 +02:00
Simon Sessingø	b54a25804a	Added group attribute to stop router from merging exception-handlers (issue: #573 ) - Added new mergeExceptionHandlers attribute to stop router from merging exception-handlers. - RouteGroup: Added setMergeExceptionHandlers and getMergeExceptionHandlers methods. - IRouteGroup: Added setMergeExceptionHandlers and getMergeExceptionHandlers method. - Updated documentation to reflect changes. - Added unit-tests.	2021-07-17 21:46:05 +02:00
Simon Sessingø	e3145cc1ec	Merge pull request #576 from skipperbent/v4-release V4 release	2021-07-16 22:31:20 +02:00
Simon Sessingø	4b8dbdc9e5	Merge pull request #575 from skipperbent/v4-development Updated documentation	2021-07-16 22:31:06 +02:00
Simon Sessingø	7fe66ac938	Updated documentation - Changed Router references to SimpleRouter. - Updated ErrorHandler example. - Minor tweaks	2021-07-16 22:28:54 +02:00
Simon Sessingø	75ea58dd9c	Merge pull request #569 from skipperbent/v4-release V4 release	2021-06-15 10:16:37 +02:00
Simon Sessingø	e5552a88cf	Merge pull request #568 from skipperbent/v4-development Version 4.3.6.1	2021-06-15 10:16:25 +02:00
Simon Sessingø	7d80517c2f	Merge pull request #567 from skipperbent/v4-setmatch-parameters Fixed custom regex (setMatch) not setting parsed parameters (issue: #566)	2021-06-15 10:13:54 +02:00
Simon Sessingø	b3c135c723	Development - Fixed DebugHandler::fireEvent not providing correct arguments when calling fireEvents. - Fixed custom regex setMatch not setting parsed parameters correctly (issue: #566). - Added unit-tests for catching issue in the future. - Added php-stan typehints.	2021-06-15 10:11:09 +02:00
Simon Sessingø	470000ad05	Merge pull request #564 from skipperbent/v4-release V4 release	2021-06-09 09:19:27 +02:00
Simon Sessingø	e990b95c50	Merge pull request #563 from skipperbent/v4-development Version 4.3.6.0	2021-06-09 09:19:14 +02:00
Simon Sessingø	a35400b7a0	Merge pull request #562 from skipperbent/v4-cleanup-bugfixes Development	2021-06-09 09:16:39 +02:00
Simon Sessingø	22606dfc12	Updates	2021-06-09 09:13:11 +02:00
Simon Sessingø	5cd6cab801	Development - Fixed issue causing default-namespace to add duplicate namespace when using type-hints (issue: #561). - Fixed phpstan issues. - Tests: Fixed TestRouter not resetting namespace upon reset. - Tests: Added NSController (namespace controller) class. - Tests: added test for class hint + default namespace case. - Composer: added phpstan support + configuration. - Composer: updated phpunit version.	2021-06-09 08:54:24 +02:00
Simon Sessingø	3ffe9c8c07	Merge pull request #560 from skipperbent/v4-release V4 release	2021-05-20 15:19:12 +02:00
Simon Sessingø	319ce7a569	Merge pull request #559 from skipperbent/v4-development Version 4.3.5.0	2021-05-20 15:19:00 +02:00
Simon Sessingø	4dff4006bf	Merge pull request #558 from skipperbent/v4-exists-array Added support for InputHandler::exists to check array of indexes.	2021-05-20 15:15:51 +02:00
Simon Sessingø	eea30d0f59	Simplified RouteController and RouteResource by moving common group-match code to parent method.	2021-05-20 15:15:26 +02:00
Simon Sessingø	ece9d30905	Added support for InputHandler::exists to check array of indexes. - Updated documentation to reflect changes.	2021-05-20 15:03:56 +02:00
Simon Sessingø	44c2b99513	Merge pull request #557 from skipperbent/v4-release V4 release	2021-05-19 22:05:56 +02:00
Simon Sessingø	d4de7fc3df	Merge pull request #556 from skipperbent/v4-development Version 4.3.4.2	2021-05-19 22:05:44 +02:00
Simon Sessingø	03ef9dfb74	Merge pull request #555 from skipperbent/v4-error-group-fix Fixed issue with SimpleRouter::error not firing within group (issue: #551)	2021-05-19 22:03:39 +02:00
Simon Sessingø	4c5f825c97	Fixed issue with SimpleRouter::error not firing within group (issue: #551 ). - Fixed variable incorrect variable reference in `InputItem` class. - Added new `Router::addExceptionHandler` method. - Added parameter types in `Url` class. - Fixed phpdoc parameter-type for `Request::getHeader`.	2021-05-19 22:00:42 +02:00
Simon Sessingø	8b9e43c99e	Merge pull request #554 from skipperbent/v4-release V4 release	2021-05-19 04:43:40 +02:00
Simon Sessingø	b7c31ae434	Merge pull request #553 from skipperbent/v4-development Version 4.3.4.1	2021-05-19 04:43:29 +02:00
Simon Sessingø	0c329e4c5b	Merge pull request #552 from skipperbent/v4-exception-callback-fix SimpleRouter::error not working within group	2021-05-19 04:42:35 +02:00
Simon Sessingø	e057a76153	Removed unused variable.	2021-05-19 04:41:36 +02:00
Simon Sessingø	f7f1f1e3de	Fixed issue causing SimpleRouter::exception helper not to work when used within a group (issue: #551 )	2021-05-19 04:31:50 +02:00
Simon Sessingø	c4a9918048	Merge pull request #550 from skipperbent/v4-release V4 release	2021-05-19 00:45:48 +02:00
Simon Sessingø	f93621fa02	Merge pull request #549 from skipperbent/v4-development Version 4.3.4.0	2021-05-19 00:45:32 +02:00
Simon Sessingø	5ab8826bfb	Merge pull request #548 from skipperbent/v4-inputitem-array InputHandler optimisations.	2021-05-19 00:42:48 +02:00
Simon Sessingø	f863f931d8	Fixed php8 php-unit tests compatibility.	2021-05-18 18:08:41 +02:00
Simon Sessingø	0d6326dfbb	InputHandler optimisations. - InputItem can now be used like array (for example: input()->get('items')[0]) if value is array. - Changed default-value parameter for get, post, file can now be mixed to allow object as return-type.	2021-05-18 18:00:18 +02:00
Simon Sessingø	63a9ec65cf	Merge pull request #545 from skipperbent/v4-release V4 release	2021-05-02 14:00:27 +02:00
Simon Sessingø	448a423d5d	Merge pull request #544 from skipperbent/v4-development Version 4.3.3.0	2021-05-02 14:00:10 +02:00
Simon Sessingø	df9a855579	Merge pull request #543 from skipperbent/v4-bugfixes Bugfixes	2021-05-02 13:58:00 +02:00
Simon Sessingø	d6bd9bbd72	Development - [FEATURE] Namespace overwrite now works globally. 'Service¨' will append namespace whereas '\Service' will overwrite it. - [FEATURE] Exceptionhandlers are now rendered in reverse order from newest to oldest. This allows for exceptions to be handled from parent exceptions which were otherwise ignored. - Fixed incorrect return type for InputFile::getError to nullable int. - Added return type to all, match, controller and resource in SimpleRouter class. - Fixed incorrect usage of parse_str in Url::setQueryString method. - Fixed incorrect expected value in array_flip in Url::removeParams method.	2021-05-02 13:48:13 +02:00
Simon Sessingø	14d3577a6a	Merge pull request #542 from skipperbent/v4-release V4 release	2021-04-28 10:05:46 +02:00
Simon Sessingø	569b3a8760	Merge pull request #541 from skipperbent/v4-development Version 4.3.2.3	2021-04-28 10:05:34 +02:00
Simon Sessingø	79a075ef49	Merge pull request #540 from skipperbent/v4-type-hint-notice Fixed deprecated notice when using class type hinting (issue: #538)	2021-04-28 10:03:55 +02:00
Simon Sessingø	c66d7f7df7	Fixed deprecated notice when using class type hinting (issue: #538 )	2021-04-28 09:57:47 +02:00
Simon Sessingø	869c65f347	Merge pull request #539 from skipperbent/v4-release V4 release	2021-04-28 03:42:42 +02:00
Simon Sessingø	c6d0ff3c0e	Merge pull request #536 from skipperbent/v4-development Version 4.3.2.2	2021-04-28 03:41:47 +02:00
Simon Sessingø	718d60c53b	Removed return type from IResourceController as the return type can be mixed.	2021-04-04 11:21:26 +02:00
Simon Sessingø	4fc48b4420	Merge pull request #535 from skipperbent/v4-release V4 release	2021-04-01 03:16:46 +02:00
Simon Sessingø	2a573f27fe	Merge pull request #534 from skipperbent/v4-development Version 4.3.2.1	2021-04-01 03:16:29 +02:00
Simon Sessingø	ecbb0825e0	Added include param parameter to Url::getAbsoluteUrl method.	2021-04-01 03:14:22 +02:00
Simon Sessingø	b94dc4355f	Optimisations	2021-04-01 03:11:05 +02:00
Simon Sessingø	52c6c226c0	[BUGFIX] Fixed issue with BaseCsrfVerifier matching urls against urls with parameters. - Added optional $includeParams parameter to Url::getRelativeUrl method.	2021-04-01 03:04:32 +02:00
Simon Sessingø	bef3207fcd	Merge pull request #533 from skipperbent/v4-release V4 release	2021-04-01 02:38:10 +02:00
Simon Sessingø	982fb9fab4	Merge pull request #532 from skipperbent/v4-development Version 4.3.2.0	2021-04-01 02:37:52 +02:00
Simon Sessingø	ca8fbf2b27	Merge pull request #531 from skipperbent/v4-feature-ip [FEATURE] IP restrict access	2021-04-01 02:35:40 +02:00
Simon Sessingø	e4584a451d	Improved phpDoc for prepend methods	2021-03-31 13:31:20 +02:00
Simon Sessingø	8b11377fe8	Fixed typo	2021-03-31 03:25:35 +02:00
Simon Sessingø	eccda10169	Added prependPrefix to Group class & updated documentation.	2021-03-31 03:23:04 +02:00
Simon Sessingø	d92d50ecdc	Updated features in documentation	2021-03-31 03:08:01 +02:00
Simon Sessingø	dca0389115	Merge branch 'v4-development' into v4-feature-ip	2021-03-31 03:00:16 +02:00
Simon Sessingø	7adb4e8597	Fixed wrong link for partial-groups	2021-03-31 02:40:24 +02:00
Simon Sessingø	b0e4becbba	Merge branch 'v4-development' of github.com:skipperbent/simple-php-router into v4-development	2021-03-31 02:36:48 +02:00
Simon Sessingø	3b8e92b406	Updated documentation table of contents	2021-03-31 02:36:11 +02:00
Simon Sessingø	0e393fdc5f	Minor changes - Added better description of partialGroups in the documentation. - Added custom base path example in documentation. - Added isSubRoute event parameter for EVENT_ADD_ROUTE. - Removed deprecation phpDoc from partialGroup. - Added unit-test for adding custom base path.	2021-03-31 02:31:56 +02:00
Simon Sessingø	56c73640b7	Merge pull request #530 from skipperbent/v4-feature-verifier [FEATURE] Added include property to BaseCsrfVerifier + unit tests.	2021-03-31 01:02:05 +02:00
Simon Sessingø	f91f280975	Added https scheme to Request::setUri (used when calling getAbsoluteUrl).	2021-03-30 21:13:06 +02:00
Simon Sessingø	40f9b72963	Updated documentation	2021-03-30 20:52:39 +02:00
Simon Sessingø	245b909ab6	Updated readme	2021-03-30 20:48:37 +02:00
Simon Sessingø	50b7129cab	Changed name of IpBlockAccess to IpRestrictAccess & updated documentation.	2021-03-30 20:44:40 +02:00
Simon Sessingø	57047d23ea	[FEATURE] Ip access block	2021-03-30 20:38:18 +02:00
Simon Sessingø	a98b5ba842	Fixed unit-tests for CsrfVerifierTest	2021-03-30 18:54:45 +02:00
Simon Sessingø	b3d28e9432	[FEATURE] Added include åproperty to BaseCsrfVerifier + unit tests.	2021-03-30 18:49:37 +02:00
Simon Sessingø	d7bdee1092	Merge pull request #529 from skipperbent/v4-release V4 release	2021-03-29 22:31:18 +02:00
Simon Sessingø	8c5ed8410a	Merge pull request #525 from skipperbent/v4-release V4 release	2021-03-29 01:19:40 +02:00