diff --git a/kiri-annotation/Route/RequestMapping.php b/kiri-annotation/Route/RequestMapping.php index b2bde74b..31fd7671 100644 --- a/kiri-annotation/Route/RequestMapping.php +++ b/kiri-annotation/Route/RequestMapping.php @@ -9,11 +9,11 @@ use Kiri\Annotation\AbstractAttribute; /** - * @param Method $method + * @param RequestMethod $method * @param string $path * @param string|null $version */ - public function __construct(Method $method, string $path, string $version = null) + public function __construct(RequestMethod $method, string $path, string $version = null) { } diff --git a/kiri-annotation/Route/Method.php b/kiri-annotation/Route/RequestMethod.php similarity index 96% rename from kiri-annotation/Route/Method.php rename to kiri-annotation/Route/RequestMethod.php index 702d6002..b7d5b4b5 100644 --- a/kiri-annotation/Route/Method.php +++ b/kiri-annotation/Route/RequestMethod.php @@ -2,7 +2,7 @@ namespace Kiri\Annotation\Route; -enum Method +enum RequestMethod { diff --git a/kiri-annotation/Route/Route.php b/kiri-annotation/Route/Route.php index 0ea44fd4..dfba737f 100644 --- a/kiri-annotation/Route/Route.php +++ b/kiri-annotation/Route/Route.php @@ -14,10 +14,10 @@ use Kiri; /** * Route constructor. * @param string $uri - * @param Method $method + * @param RequestMethod $method * @param string $version */ - public function __construct(public string $uri, public Method $method, public string $version = 'v.1.0') + public function __construct(public string $uri, public RequestMethod $method, public string $version = 'v.1.0') { $this->uri = '/' . ltrim($this->uri, '/'); } @@ -31,7 +31,7 @@ use Kiri; public function execute(mixed $class, mixed $method = null): bool { $di = Kiri::getDi()->get(Router::class); - $di->addRoute($this->method->getString(), $this->uri, $class . '@' . $method); + $di->addRoute($this->method, $this->uri, $class . '@' . $method); return parent::execute($class, $method); } diff --git a/kiri-annotation/Route/TestController.php b/kiri-annotation/Route/TestController.php index dc14a9d0..00ddd284 100644 --- a/kiri-annotation/Route/TestController.php +++ b/kiri-annotation/Route/TestController.php @@ -12,7 +12,7 @@ class TestController /** * @return void */ - #[RequestMapping(method: Method::REQUEST_GET, path: '/', version: 'v1')] + #[RequestMapping(method: RequestMethod::REQUEST_GET, path: '/', version: 'v1')] #[Aspect(aspect: LoggerAspect::class)] #[Middleware(middleware: LoggerAspect::class)] public function index()