diff --git a/src/Handler.php b/src/Handler.php index f648d49..b026afc 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -5,21 +5,12 @@ namespace Kiri\Router; use Closure; use Kiri; -use Kiri\Router\Format\ArrayFormat; use Kiri\Router\Format\IFormat; use Kiri\Router\Format\MixedFormat; use Kiri\Router\Format\NoBody; -use Kiri\Router\Format\OtherFormat; -use Kiri\Router\Format\ResponseFormat; -use Kiri\Router\Format\VoidFormat; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\ContainerInterface; -use Psr\Container\NotFoundExceptionInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; -use ReflectionFunction; -use ReflectionMethod; class Handler implements RequestHandlerInterface { diff --git a/src/RouterCollector.php b/src/RouterCollector.php index 6d8a68a..96e648d 100644 --- a/src/RouterCollector.php +++ b/src/RouterCollector.php @@ -8,8 +8,6 @@ namespace Kiri\Router; use Closure; use Kiri\Router\Base\NotFoundController; use Kiri\Router\Constrict\RequestMethod; -use Kiri\Di\Inject\Container; -use Psr\Container\ContainerInterface; use Throwable; use Traversable; use Kiri\Router\Base\Middleware; @@ -64,9 +62,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate */ public function __construct() { - $found = di(NotFoundController::class); - - $this->found = new Handler([$found, 'fail'], [], ResponseFormat::class); + $this->found = new Handler([NotFoundController::class, 'fail'], [], ResponseFormat::class); }