Merge remote-tracking branch 'origin/pagination-theme' into paginatio…

…n-theme
yiisoft · Jan 16, 2024 · 804dd9f · 804dd9f
2 parents 5667a44 + 0501d21
commit 804dd9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/KeysetPagination.php b/src/KeysetPagination.php
@@ -45,9 +45,7 @@ protected function getItems(): array
 
     protected function getPaginator(): KeysetPaginator
     {
-        return $this->paginator === null
-            ? throw new Exception\PaginatorNotSetException()
-            : $this->paginator;
+        return $this->paginator ?? throw new Exception\PaginatorNotSetException();
     }
 
     protected function isFirstPage(int|string $page, bool $isPrevious): bool

diff --git a/src/OffsetPagination.php b/src/OffsetPagination.php
@@ -121,9 +121,7 @@ protected function getItems(): array
 
     protected function getPaginator(): OffsetPaginator
     {
-        return $this->paginator === null
-            ? throw new Exception\PaginatorNotSetException()
-            : $this->paginator;
+        return $this->paginator ?? throw new Exception\PaginatorNotSetException();
     }
 
     protected function isFirstPage(int|string $page, bool $isPrevious): bool