Use request-model attributes (#104)

.scrutinizer.yml

@@ -13,7 +13,7 @@ build:
       YII_ENV: test
 
     php:
-      version: 8.0.11
+      version: 8.1.8
       ini:
         xdebug.mode: coverage
 
@@ -33,7 +33,7 @@ build:
         override:
           - command: |
               ./yii serve 127.0.0.1:8080 > ./runtime/yii.log 2>&1 &
-              vendor/bin/codecept run acceptance --coverage-xml --env github-ci
+              vendor/bin/codecept run --coverage-xml --env github-ci
             on_node: 1
             coverage:
               file: runtime/tests/_output/coverage.xml

src/Blog/BlogController.php

@@ -9,12 +9,23 @@
 use Psr\Http\Message\ResponseInterface as Response;
 use Yiisoft\DataResponse\DataResponseFactoryInterface;
 use OpenApi\Annotations as OA;
+use Yiisoft\RequestModel\Attribute\Query;
+use Yiisoft\RequestModel\Attribute\Route;
 
 /**
  * @OA\Tag(
  *     name="blog",
  *     description="Blog"
  * )
+ * @OA\Parameter(
+ *      @OA\Schema(
+ *          type="int",
+ *          example="2"
+ *      ),
+ *      in="query",
+ *      name="page",
+ *      parameter="PageRequest"
+ * )
  */
 final class BlogController
 {
@@ -72,9 +83,9 @@ public function __construct(
      *    ),
      * )
      */
-    public function index(PageRequest $request, PaginatorFormatter $paginatorFormatter): Response
+    public function index(PaginatorFormatter $paginatorFormatter, #[Query('page')] int $page = 1): 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 +146,12 @@ public function index(PageRequest $request, PaginatorFormatter $paginatorFormatt
      *    ),
      * )
      */
-    public function view(ViewPostRequest $request): Response
+    public function view(#[Route('id')] int $id): Response
     {
         return $this->responseFactory->createResponse(
             [
                 'post' => $this->postFormatter->format(
-                    $this->blogService->getPost($request->getId())
+                    $this->blogService->getPost($id)
                 ),
             ]
         );
@@ -208,10 +219,10 @@ public function create(EditPostRequest $postRequest, UserRequest $userRequest):
      *     )
      * )
      */
-    public function update(EditPostRequest $postRequest): Response
+    public function update(EditPostRequest $postRequest, #[Route('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\Route;
 
 /**
  * @OA\Tag(
@@ -114,12 +114,12 @@ public function list(): ResponseInterface
      *    ),
      * )
      */
-    public function get(CurrentRoute $currentRoute): ResponseInterface
+    public function get(#[Route('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();
         }