Updated readme + gitignore

.gitignore

@@ -1,4 +1,3 @@
 composer.lock
 vendor/
-tests/tmp/*
 .idea/

README.md

@@ -14,8 +14,7 @@ SimpleRouter::get('/', function() {
 
 ### Support the project
 
-If you like simple-router and wish to see the continued development and maintenance of the project,
-please consider showing your support by buying me a coffee. Supporters will be listed under the credits section of this documentation.
+If you like simple-router and wish to see the continued development and maintenance of the project, please consider showing your support by buying me a coffee. Supporters will be listed under the credits section of this documentation.
 
 You can donate any amount of your choice by [clicking here](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NNX4D2RUSALCN).
 
@@ -52,9 +51,6 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 	- [Partial groups](#partial-groups)
 	- [Form Method Spoofing](#form-method-spoofing)
 	- [Accessing The Current Route](#accessing-the-current-route)
-	- [Dependency injection](#dependency-injection)
-	    - [Enabling dependency injection](#enabling-dependency-injection)
-	    - [More reading](#more-reading)
 	- [Other examples](#other-examples)
 - [CSRF-protection](#csrf-protection)
 	- [Adding CSRF-verifier](#adding-csrf-verifier)
@@ -90,6 +86,8 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 		- [Changing current route](#changing-current-route)
 		- [Bootmanager: loading routes dynamically](#bootmanager-loading-routes-dynamically)
 		- [Adding routes manually](#adding-routes-manually)
+	- [Custom class-loader](#custom-class-loader)
+	  - [Integrating with php-di](#Integrating-with-php-di)
 	- [Parameters](#parameters)
 	- [Extending](#extending)
 - [Help and support](#help-and-support)
@@ -251,6 +249,7 @@ To add `favicon.ico` to the IIS ignore-list, add the following line to the `<con
 ```
 
 You can also make one exception for files with some extensions:
+
 ```
 <add input="{REQUEST_FILENAME}" pattern="\.ico|\.png|\.css|\.jpg" negate="true" ignoreCase="true" />
 ```
@@ -258,6 +257,7 @@ You can also make one exception for files with some extensions:
 If you are using `$_SERVER['ORIG_PATH_INFO']`, you will get `\index.php\` as part of the returned value. 
 
 **Example:**
+
 ```
 /index.php/test/mypage.php
 ```
@@ -696,88 +696,6 @@ SimpleRouter::request()->getLoadedRoute();
 request()->getLoadedRoute();
 ```
 
-## Dependency injection
-
-simple-router supports dependency injection using the [`php-di`](http://php-di.org/) library.
-
-Dependency injection allows the framework to automatically "inject" (load) classes added as parameters. This can simplify your code, as you can avoid creating new instances of objects you are using often in your `Controllers` etc.
-
-Here's a basic example of a controller class using dependency injection:
-
-```php
-namespace Demo\Controllers;
-
-class DefaultController {
-    
-    public function login(User $user): string 
-    {
-        // ...
-    }
-    
-}
-```
-
-The example above will automatically create a new instance of the `User` from the `$user` parameter. This means that the `$user` class contains a new instance of the `User` class and we won't need to create a new instance our self.
-
-**WARNING:** dependency injection can have some negative impact in performance. If you experience any performance issues, we recommend disabling this functionality.
-
-### Enabling dependency injection
-
-Dependency injection is disabled per default to avoid any performance issues.
-
-Before enabling dependency injection, we recommend that you read the [Container configuration](http://php-di.org/doc/container-configuration.html) section of the php-di documentation. This section covers how to configure php-di to different environments and speed-up the performance.
-
-#### Enabling for development environment
-
-The example below should ONLY be used on a development environment.
-
-```php
-// Create our new php-di container
-$container = (new \DI\ContainerBuilder())
-            ->useAutowiring(true)
-            ->build();
-
-// Add our container to simple-router and enable dependency injection
-SimpleRouter::enableDependencyInjection($container);
-```
-
-Please check the [More reading](#more-reading) section of the documentation for useful php-di links and tutorials.
-
-#### Enabling for production environment
-
-The example below compiles the injections, which can help speed up performance. 
-
-**Note:** You should change the `$cacheDir` to a cache-storage within your project.
-
-```php
-// Cache directory
-$cacheDir = sys_get_temp_dir('simple-router');
-
-// Create our new php-di container
-$container = (new \DI\ContainerBuilder())
-            ->enableCompilation($cacheDir)
-            ->writeProxiesToFile(true, $cacheDir . '/proxies')
-            ->useAutowiring(true)
-            ->build();
-
-// Add our container to simple-router and enable dependency injection
-SimpleRouter::enableDependencyInjection($container);
-```
-
-Please check the [More reading](#more-reading) section of the documentation for useful php-di links and tutorials.
-
-### More reading
-
-For more information about dependency injection, configuration and settings - we recommend that you check the php-di documentation or some of the useful links we've gathered below.
-
-#### Useful links
-
-- [php-di documentation](http://php-di.org/doc/)
-- [Understanding dependency injection](http://php-di.org/doc/understanding-di.html)
-- [Best practices guide](http://php-di.org/doc/best-practices.html)
-- [Configuring the container](http://php-di.org/doc/container-configuration.html)
-- [Definitions](http://php-di.org/doc/definition.html)
-
 ## Other examples
 
 You can find many more examples in the `routes.php` example-file below:
@@ -1543,6 +1461,120 @@ $route->setPrefix('v1');
 $router->addRoute($route);
 ```
 
+## Custom class loader
+
+You can easily extend simple-router to support custom injection frameworks like php-di by taking advantage of the ability to add your custom class-loader.
+
+Class-loaders must inherit the `IClassLoader` interface.
+
+**Example:**
+
+```php
+class MyCustomClassLoader implements IClassLoader
+{
+    /**
+     * Load class
+     *
+     * @param string $class
+     * @return object
+     * @throws NotFoundHttpException
+     */
+    public function loadClass(string $class)
+    {
+        if (\class_exists($class) === false) {
+            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $class), 404);
+        }
+
+        return new $class();
+    }
+
+    /**
+     * Load closure
+     *
+     * @param Callable $closure
+     * @param array $parameters
+     * @return mixed
+     */
+    public function loadClosure(Callable $closure, array $parameters)
+    {
+        return \call_user_func_array($closure, $parameters);
+    }
+
+}
+```
+
+Next, we need to configure our `routes.php` so the router uses our `MyCustomClassLoader` class for loading classes. This can be done by adding the following line to your `routes.php` file.
+
+```php
+SimpleRouter::setCustomClassLoader(new MyCustomClassLoader());
+```
+
+### Integrating with php-di
+
+php-di support was discontinued by version 4.3, however you can easily add it again by creating your own class-loader like the example below:
+
+```php
+class MyCustomClassLoader implements IClassLoader
+{
+
+    protected $container;
+
+    public function __construct()
+    {
+        // Setup php-di
+        // Create our new php-di container
+        $container = (new \DI\ContainerBuilder())
+                    ->useAutowiring(true)
+                    ->build();
+    }
+
+    /**
+     * Load class
+     *
+     * @param string $class
+     * @return object
+     * @throws NotFoundHttpException
+     */
+    public function loadClass(string $class)
+    {
+        if (class_exists($class) === false) {
+            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $class), 404);
+        }
+
+        if ($this->container !== null) {
+            try {
+                return $this->container->get($class);
+            } catch (\Exception $e) {
+                throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+            }
+        }
+
+        return new $class();
+    }
+
+    /**
+     * Load closure
+     *
+     * @param Callable $closure
+     * @param array $parameters
+     * @return mixed
+     */
+    public function loadClosure(Callable $closure, array $parameters)
+    {
+        if ($this->container !== null) {
+            try {
+                return $this->container->call($closure, $parameters);
+            } catch (\Exception $e) {
+                throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+            }
+        }
+
+        return \call_user_func_array($closure, $parameters);
+    }
+
+}
+```
+
 ## Parameters
 
 This section contains advanced tips & tricks on extending the usage for parameters.

src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php

@@ -10,7 +10,7 @@ class ClassLoader implements IClassLoader
      * Load class
      *
      * @param string $class
-     * @return mixed
+     * @return object
      * @throws NotFoundHttpException
      */
     public function loadClass(string $class)
@@ -28,7 +28,6 @@ class ClassLoader implements IClassLoader
      * @param Callable $closure
      * @param array $parameters
      * @return mixed
-     * @throws NotFoundHttpException
      */
     public function loadClosure(Callable $closure, array $parameters)
     {

src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php

@@ -5,8 +5,20 @@ namespace Pecee\SimpleRouter\ClassLoader;
 interface IClassLoader
 {
 
+    /**
+     * Called when loading class
+     * @param string $class
+     * @return object
+     */
     public function loadClass(string $class);
 
+    /**
+     * Called when loading method
+     *
+     * @param callable $closure
+     * @param array $parameters
+     * @return mixed
+     */
     public function loadClosure(Callable $closure, array $parameters);
 
 }