diff --git a/composer.json b/composer.json index 90c7a09..1087278 100755 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.3||^8.0", "altorouter/altorouter": "^2.0.2", - "mindplay/middleman": "^3.0.3", + "mindplay/middleman": "^4.0", "php-di/invoker": "^2.3.0", "psr/container": "^1.0", "psr/http-message": "^1.0", diff --git a/src/Route.php b/src/Route.php index 9f74723..32b1799 100644 --- a/src/Route.php +++ b/src/Route.php @@ -4,15 +4,9 @@ use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; -use Rareloop\Router\Exceptions\RouteClassStringControllerNotFoundException; -use Rareloop\Router\Exceptions\RouteClassStringMethodNotFoundException; -use Rareloop\Router\Exceptions\RouteClassStringParseException; use Rareloop\Router\Exceptions\RouteNameRedefinedException; use Rareloop\Router\Invoker; -use Rareloop\Router\ProvidesMiddleware; use Spatie\Macroable\Macroable; -use Laminas\Diactoros\Response\EmptyResponse; -use Laminas\Diactoros\Response\HtmlResponse; use Laminas\Diactoros\ServerRequest; use mindplay\middleman\Dispatcher; @@ -77,7 +71,7 @@ public function handle(ServerRequest $request, RouteParams $params): ResponseInt return $this->middlewareResolver->resolve($name); }); - return $dispatcher->dispatch($request); + return $dispatcher->handle($request); } private function gatherMiddleware(): array diff --git a/src/Router.php b/src/Router.php index 8595a9c..aaa752c 100644 --- a/src/Router.php +++ b/src/Router.php @@ -194,7 +194,7 @@ function ($request) use ($route, $params) { return $this->middlewareResolver->resolve($name); }); - return $dispatcher->dispatch($request); + return $dispatcher->handle($request); } public function has(string $name)