Adapt attributes

composer.json

@@ -52,7 +52,7 @@
         "yiisoft/log": "^2.0",
         "yiisoft/log-target-file": "^2.0",
         "yiisoft/request-body-parser": "^1.1",
-        "yiisoft/request-model": "dev-master",
+        "yiisoft/request-model": "dev-attributes",
         "yiisoft/router": "^1.0",
         "yiisoft/router-fastroute": "^1.0",
         "yiisoft/security": "^1.0",

src/Blog/BlogController.php

@@ -9,6 +9,8 @@
 use Psr\Http\Message\ResponseInterface as Response;
 use Yiisoft\DataResponse\DataResponseFactoryInterface;
 use OpenApi\Annotations as OA;
+use Yiisoft\RequestModel\Attribute\QueryParam;
+use Yiisoft\RequestModel\Attribute\RouteParam;
 
 /**
  * @OA\Tag(
@@ -72,9 +74,9 @@ public function __construct(
      *    ),
      * )
      */
-    public function index(PageRequest $request, PaginatorFormatter $paginatorFormatter): Response
+    public function index(PaginatorFormatter $paginatorFormatter, #[QueryParam('page')] int $page): Response
     {
-        $paginator = $this->blogService->getPosts($request->getPage());
+        $paginator = $this->blogService->getPosts($page);
         $posts = [];
         foreach ($paginator->read() as $post) {
             $posts[] = $this->postFormatter->format($post);
@@ -135,12 +137,12 @@ public function index(PageRequest $request, PaginatorFormatter $paginatorFormatt
      *    ),
      * )
      */
-    public function view(ViewPostRequest $request): Response
+    public function view(#[RouteParam('id')] int $id): Response
     {
         return $this->responseFactory->createResponse(
             [
                 'post' => $this->postFormatter->format(
-                    $this->blogService->getPost($request->getId())
+                    $this->blogService->getPost($id)
                 ),
             ]
         );
@@ -208,10 +210,10 @@ public function create(EditPostRequest $postRequest, UserRequest $userRequest):
      *     )
      * )
      */
-    public function update(EditPostRequest $postRequest): Response
+    public function update(EditPostRequest $postRequest, #[RouteParam('id')] int $id): Response
     {
         $post = $this->postBuilder->build(
-            $this->blogService->getPost($postRequest->getId()),
+            $this->blogService->getPost($id),
             $postRequest
         );
 

src/User/UserController.php

@@ -9,7 +9,7 @@
 use OpenApi\Annotations as OA;
 use Psr\Http\Message\ResponseInterface;
 use Yiisoft\DataResponse\DataResponseFactoryInterface;
-use Yiisoft\Router\CurrentRoute;
+use Yiisoft\RequestModel\Attribute\RouteParam;
 
 /**
  * @OA\Tag(
@@ -114,12 +114,12 @@ public function list(): ResponseInterface
      *    ),
      * )
      */
-    public function get(CurrentRoute $currentRoute): ResponseInterface
+    public function get(#[RouteParam('id')] int $id): ResponseInterface
     {
         /**
          * @var User $user
          */
-        $user = $this->userRepository->findByPK($currentRoute->getArgument('id'));
+        $user = $this->userRepository->findByPK($id);
         if ($user === null) {
             throw new NotFoundException();
         }