Merge branch 'v4-development' into feature-default-namespace

src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php

@@ -2,28 +2,15 @@
 
 namespace Pecee\SimpleRouter\ClassLoader;
 
-use DI\Container;
 use Pecee\SimpleRouter\Exceptions\ClassNotFoundHttpException;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 class ClassLoader implements IClassLoader
 {
-    /**
-     * Dependency injection enabled
-     * @var bool
-     */
-    protected $useDependencyInjection = false;
-
-    /**
-     * @var Container|null
-     */
-    protected $container;
-
     /**
      * Load class
      *
      * @param string $class
-     * @return mixed
+     * @return object
      * @throws NotFoundHttpException
      */
     public function loadClass(string $class)
@@ -32,17 +19,6 @@ class ClassLoader implements IClassLoader
             throw new ClassNotFoundHttpException(sprintf('Class "%s" does not exist', $class), 404, null, $class);
         }
 
-        if ($this->useDependencyInjection === true) {
-            $container = $this->getContainer();
-            if ($container !== null) {
-                try {
-                    return $container->get($class);
-                } catch (\Exception $e) {
-                    throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
-                }
-            }
-        }
-
         return new $class();
     }
 
@@ -52,68 +28,10 @@ class ClassLoader implements IClassLoader
      * @param Callable $closure
      * @param array $parameters
      * @return mixed
-     * @throws NotFoundHttpException
      */
     public function loadClosure(Callable $closure, array $parameters)
     {
-        if ($this->useDependencyInjection === true) {
-            $container = $this->getContainer();
-            if ($container !== null) {
-                try {
-                    return $container->call($closure, $parameters);
-                } catch (\Exception $e) {
-                    throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
-                }
-            }
-        }
-
         return \call_user_func_array($closure, $parameters);
     }
 
-    /**
-     * Get dependency injector container.
-     *
-     * @return Container|null
-     */
-    public function getContainer(): ?Container
-    {
-        return $this->container;
-    }
-
-    /**
-     * Set the dependency-injector container.
-     *
-     * @param Container $container
-     * @return ClassLoader
-     */
-    public function setContainer(Container $container): self
-    {
-        $this->container = $container;
-
-        return $this;
-    }
-
-    /**
-     * Enable or disable dependency injection.
-     *
-     * @param bool $enabled
-     * @return static
-     */
-    public function useDependencyInjection(bool $enabled): self
-    {
-        $this->useDependencyInjection = $enabled;
-
-        return $this;
-    }
-
-    /**
-     * Return true if dependency injection is enabled.
-     *
-     * @return bool
-     */
-    public function isDependencyInjectionEnabled(): bool
-    {
-        return $this->useDependencyInjection;
-    }
-
 }

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);
 
 }

src/Pecee/SimpleRouter/Handlers/EventHandler.php

@@ -143,7 +143,7 @@ class EventHandler implements IEventHandler
      * Get events.
      *
      * @param string|null $name Filter events by name.
-     * @param array ...$names Add multiple names...
+     * @param array|string ...$names Add multiple names...
      * @return array
      */
     public function getEvents(?string $name, ...$names): array

src/Pecee/SimpleRouter/Route/Route.php

@@ -78,7 +78,6 @@ abstract class Route implements IRoute
             $router->debug('Executing callback');
 
             /* When the callback is a function */
-
             return $router->getClassLoader()->loadClosure($callback, $parameters);
         }
 
@@ -251,7 +250,7 @@ abstract class Route implements IRoute
     /**
      * Set callback
      *
-     * @param string|array\Closure $callback
+     * @param string|array|\Closure $callback
      * @return static
      */
     public function setCallback($callback): IRoute

src/Pecee/SimpleRouter/Router.php

@@ -306,7 +306,7 @@ class Router
      *
      * @return string|null
      * @throws NotFoundHttpException
-     * @throws TokenMismatchException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
      * @throws HttpException
      * @throws \Exception
      */

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -10,7 +10,6 @@
 
 namespace Pecee\SimpleRouter;
 
-use DI\Container;
 use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
@@ -531,17 +530,12 @@ class SimpleRouter
     }
 
     /**
-     * Enable or disable dependency injection
-     *
-     * @param Container $container
-     * @return IClassLoader
+     * Set custom class-loader class used.
+     * @param IClassLoader $classLoader
      */
-    public static function enableDependencyInjection(Container $container): IClassLoader
+    public static function setCustomClassLoader(IClassLoader $classLoader): void
     {
-        return static::router()
-            ->getClassLoader()
-            ->useDependencyInjection(true)
-            ->setContainer($container);
+        static::router()->setClassLoader($classLoader);
     }
 
     /**