Route attribute (#609)

* fix-gridview * fix PageToken * fix routeArgument
yiisoft · Feb 20, 2024 · 9122601 · 9122601
1 parent f80b773
commit 9122601
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 13 deletions.
diff --git a/blog/README.md b/blog/README.md
@@ -54,7 +54,7 @@ More routes could be added by editing `src/Factory/AppRouterFactory`.
 The template comes with a  ready to use [Codeception](https://codeception.com/) configuration.
 In order to execute tests run the following command:
 
-```
+```bash
 composer run serve 127.0.0.1:8080 > ./runtime/yii.log 2>&1 &
 vendor/bin/codecept run
 ```

diff --git a/blog/config/common/params.php b/blog/config/common/params.php
@@ -16,7 +16,7 @@
 use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\Yii\Cycle\Schema\Conveyor\AttributedSchemaConveyor;
 use Yiisoft\Yii\Cycle\Schema\Provider\FromConveyorSchemaProvider;
-use Yiisoft\Yii\Cycle\Schema\Provider\PhpFileSchemaProvider;
+use \Cycle\Schema\Provider\PhpFileSchemaProvider;
 use Yiisoft\Yii\View\CsrfViewInjection;
 
 return [

diff --git a/blog/resources/views/user/index.php b/blog/resources/views/user/index.php
@@ -132,9 +132,7 @@
     ->dataReader($paginator)
     ->pagination(
         OffsetPagination::widget()
-            ->menuClass('pagination justify-content-center')
             ->paginator($paginator)
-            ->urlArguments([])
             ->render(),
     )
     ->rowAttributes(['class' => 'align-middle'])

diff --git a/blog/src/Auth/Controller/AuthController.php b/blog/src/Auth/Controller/AuthController.php
@@ -46,7 +46,7 @@ public function login(
         ) {
             $identity = $this->authService->getIdentity();
 
-            if ($identity instanceof CookieLoginIdentityInterface && $loginForm->getAttributeValue('rememberMe')) {
+            if ($identity instanceof CookieLoginIdentityInterface && $loginForm->getPropertyValue('rememberMe')) {
                 return $cookieLogin->addCookie($identity, $this->redirectToMain());
             }
 

diff --git a/blog/src/Blog/Archive/ArchiveController.php b/blog/src/Blog/Archive/ArchiveController.php
@@ -7,7 +7,7 @@
 use App\Blog\Tag\TagRepository;
 use Psr\Http\Message\ResponseInterface as Response;
 use Yiisoft\Data\Paginator\OffsetPaginator;
-use Yiisoft\Hydrator\Temp\RouteArgument;
+use Yiisoft\Router\HydratorAttribute\RouteArgument;
 use Yiisoft\Yii\View\ViewRenderer;
 
 final class ArchiveController

diff --git a/blog/src/Blog/BlogController.php b/blog/src/Blog/BlogController.php
@@ -9,7 +9,7 @@
 use App\Blog\Tag\TagRepository;
 use Psr\Http\Message\ResponseInterface as Response;
 use Yiisoft\Data\Paginator\OffsetPaginator;
-use Yiisoft\Hydrator\Temp\RouteArgument;
+use Yiisoft\Router\HydratorAttribute\RouteArgument;
 use Yiisoft\User\CurrentUser;
 use Yiisoft\Yii\View\ViewRenderer;
 

diff --git a/blog/src/Blog/CommentController.php b/blog/src/Blog/CommentController.php
@@ -7,7 +7,7 @@
 use App\Blog\Comment\CommentService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Yiisoft\Hydrator\Temp\RouteArgument;
+use Yiisoft\Router\HydratorAttribute\RouteArgument;
 use Yiisoft\Yii\View\ViewRenderer;
 
 final class CommentController

diff --git a/blog/src/User/Controller/UserController.php b/blog/src/User/Controller/UserController.php
@@ -5,18 +5,18 @@
 namespace App\User\Controller;
 
 use App\User\UserRepository;
+use Yiisoft\Data\Paginator\PageToken;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Yiisoft\Data\Paginator\OffsetPaginator;
 use Yiisoft\Data\Reader\Sort;
 use Yiisoft\Input\Http\Attribute\Parameter\Body;
 use Yiisoft\Input\Http\Attribute\Parameter\Query;
-use Yiisoft\Hydrator\Temp\RouteArgument;
+use Yiisoft\Router\HydratorAttribute\RouteArgument;
 use Yiisoft\Yii\View\ViewRenderer;
 
 final class UserController
 {
-    private const PAGINATION_INDEX = 5;
 
     public function __construct(private ViewRenderer $viewRenderer)
     {
@@ -40,7 +40,7 @@ public function index(
         }
 
         $paginator = (new OffsetPaginator($dataReader));
-        $paginator = $paginator->withNextPageToken((string) $page)->withPageSize($pageSize);
+        $paginator = $paginator->withToken(PageToken::next((string) $page))->withPageSize($pageSize);
 
         return $this->viewRenderer->render('index', ['paginator' => $paginator]);
     }

diff --git a/blog/src/Widget/OffsetPagination.php b/blog/src/Widget/OffsetPagination.php
@@ -37,7 +37,7 @@ public function urlGenerator(Closure $generator): self
 
     public function isRequired(): bool
     {
-        return $this->paginator !== null && $this->paginator->isRequired();
+        return $this->paginator !== null && $this->paginator->isPaginationRequired();
     }
 
     /**

diff --git a/blog/tests/Acceptance/LoginAcceptanceCest.php b/blog/tests/Acceptance/LoginAcceptanceCest.php
@@ -66,7 +66,7 @@ public function testLoginSubmitFormWrongDataPassword(AcceptanceTester $I): void
     }
 
     /**
-     * @depends \App\Tests\Acceptance\SignupAcceptanceCest:testRegisterSuccess
+     * @depends App\Tests\Acceptance\SignupAcceptanceCest:testRegisterSuccess
      */
     public function testLoginUsernameSubmitFormSuccessData(AcceptanceTester $I): void
     {