#210 Some refactoring

johncms · Mar 30, 2022 · 538e020 · ging-dev · Mar 30, 2022 · 538e020
1 parent 0887bb4
commit 538e020
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/system/src/Utility/Pagination.php b/system/src/Utility/Pagination.php
@@ -23,16 +23,12 @@ public function __construct(int $total, ?int $perPage = null, string $pageParamN
         $this->total = $total;
         $this->pageParamName = $pageParamName;
         $this->request = di(Request::class);
-        if (! $perPage) {
-            $this->perPage = di(SiteSettings::class)->getPerPage();
-        } else {
-            $this->perPage = $perPage;
-        }
+        $this->setPerPage($perPage);
         $this->setCurrentPage($currentPage);
         $this->pagination = new \Compolomus\Pagination\Pagination($this->currentPage, $this->perPage, $this->total, 2);
     }
 
-    public function setCurrentPage(?int $currentPage = null): static
+    private function setCurrentPage(?int $currentPage = null): void
     {
         if ($currentPage) {
             $this->currentPage = $currentPage;
@@ -42,7 +38,15 @@ public function setCurrentPage(?int $currentPage = null): static
                 $this->currentPage = 1;
             }
         }
-        return $this;
+    }
+
+    private function setPerPage(?int $perPage): void
+    {
+        if (! $perPage) {
+            $this->perPage = di(SiteSettings::class)->getPerPage();
+        } else {
+            $this->perPage = $perPage;
+        }
     }
 
     private function buildUrl(int $page): string