diff --git a/src/Annotate/Delete.php b/src/Annotate/Delete.php index c063974..4a9f464 100644 --- a/src/Annotate/Delete.php +++ b/src/Annotate/Delete.php @@ -28,14 +28,12 @@ class Delete extends AbstractRequestMethod implements InjectMethodInterface */ public function dispatch(string $class, string $method): void { - $controller = \Kiri::getDi()->get($class); - // TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/'); if (!empty($this->version)) { $path = '/' . trim($this->version) . $path; } - Router::addRoute(RequestMethod::REQUEST_DELETE, $path, [$controller, $method]); + Router::addRoute(RequestMethod::REQUEST_DELETE, $path, [$class, $method]); } diff --git a/src/Annotate/Get.php b/src/Annotate/Get.php index 6e06b54..629a9ba 100644 --- a/src/Annotate/Get.php +++ b/src/Annotate/Get.php @@ -28,14 +28,12 @@ class Get extends AbstractRequestMethod implements InjectMethodInterface */ public function dispatch(string $class, string $method): void { - $controller = \Kiri::getDi()->get($class); - // TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/'); if (!empty($this->version)) { $path = '/' . trim($this->version) . $path; } - Router::addRoute(RequestMethod::REQUEST_GET, $path, [$controller, $method]); + Router::addRoute(RequestMethod::REQUEST_GET, $path, [$class, $method]); } } diff --git a/src/Annotate/Head.php b/src/Annotate/Head.php index c432106..448e0d7 100644 --- a/src/Annotate/Head.php +++ b/src/Annotate/Head.php @@ -29,13 +29,12 @@ class Head extends AbstractRequestMethod implements InjectMethodInterface */ public function dispatch(string $class, string $method): void { - $controller = Kiri::getDi()->get($class); // TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/'); if (!empty($this->version)) { $path = '/' . trim($this->version) . $path; } - Router::addRoute(RequestMethod::REQUEST_HEAD, $path, [$controller, $method]); + Router::addRoute(RequestMethod::REQUEST_HEAD, $path, [$class, $method]); } diff --git a/src/Annotate/Options.php b/src/Annotate/Options.php index 76cfd5a..8ba06a3 100644 --- a/src/Annotate/Options.php +++ b/src/Annotate/Options.php @@ -30,14 +30,12 @@ class Options extends AbstractRequestMethod implements InjectMethodInterface */ public function dispatch(string $class, string $method): void { - $controller = Kiri::getDi()->get($class); - // TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/'); if (!empty($this->version)) { $path = '/' . trim($this->version) . $path; } - Router::addRoute(RequestMethod::REQUEST_OPTIONS, $path, [$controller, $method]); + Router::addRoute(RequestMethod::REQUEST_OPTIONS, $path, [$class, $method]); } diff --git a/src/Annotate/Post.php b/src/Annotate/Post.php index 1126b29..e53402d 100644 --- a/src/Annotate/Post.php +++ b/src/Annotate/Post.php @@ -30,13 +30,11 @@ class Post extends AbstractRequestMethod implements InjectMethodInterface public function dispatch(string $class, string $method): void { // TODO: Implement dispatch() method. - $controller = Kiri::getDi()->get($class); - $path = '/' . ltrim($this->path, '/'); if (!empty($this->version)) { $path = '/' . trim($this->version) . $path; } - Router::addRoute(RequestMethod::REQUEST_POST, $path, [$controller, $method]); + Router::addRoute(RequestMethod::REQUEST_POST, $path, [$class, $method]); } diff --git a/src/Annotate/Put.php b/src/Annotate/Put.php index eebdf96..e544dc2 100644 --- a/src/Annotate/Put.php +++ b/src/Annotate/Put.php @@ -32,13 +32,12 @@ class Put extends AbstractRequestMethod implements InjectMethodInterface */ public function dispatch(string $class, string $method): void { - $controller = Kiri::getDi()->get($class); // TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/'); if (!empty($this->version)) { $path = '/' . trim($this->version) . $path; } - Router::addRoute(RequestMethod::REQUEST_PUT, $path, [$controller, $method]); + Router::addRoute(RequestMethod::REQUEST_PUT, $path, [$class, $method]); } } diff --git a/src/Annotate/Route.php b/src/Annotate/Route.php index 936229b..d4fd5c9 100644 --- a/src/Annotate/Route.php +++ b/src/Annotate/Route.php @@ -28,11 +28,10 @@ class Route extends AbstractRequestMethod implements InjectMethodInterface */ public function dispatch(string $class, string $method): void { - $controller = \Kiri::getDi()->get($class); $path = '/' . ltrim($this->path, '/'); if (!empty($this->version)) { $path = '/' . trim($this->version) . $path; } - Router::addRoute([$this->method], $path, [$controller, $method]); + Router::addRoute([$this->method], $path, [$class, $method]); } }