Allow all Pager queries by default

aplus-framework · Aug 18, 2023 · bcda539 · bcda539
1 parent 135f701
commit bcda539
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/Model.php b/src/Model.php
@@ -167,9 +167,9 @@ abstract class Model implements ModelInterface
      */
     protected string $pagerQuery;
     /**
-     * @var array<string>
+     * @var array<string>|null
      */
-    protected array $pagerAllowedQueries;
+    protected array | null $pagerAllowedQueries = null;
     /**
      * Pager URL.
      *
@@ -537,10 +537,7 @@ protected function setPager(Pager $pager) : static
         if (isset($temp)) {
             $pager->setUrl($temp);
         }
-        $temp = $this->getPagerAllowedQueries();
-        if (isset($temp)) {
-            $pager->setAllowedQueries($temp);
-        }
+        $pager->setAllowedQueries($this->getPagerAllowedQueries());
         $temp = $this->getPagerView();
         if (isset($temp)) {
             $pager->setDefaultView($temp);
@@ -586,7 +583,7 @@ protected function getPagerQuery() : ?string
      */
     protected function getPagerAllowedQueries() : ?array
     {
-        return $this->pagerAllowedQueries ?? null;
+        return $this->pagerAllowedQueries;
     }
 
     /**

diff --git a/tests/ModelMock.php b/tests/ModelMock.php
@@ -24,7 +24,7 @@ class ModelMock extends Model
     public string $pagerView;
     public string $pagerUrl;
     public string $pagerQuery;
-    public array $pagerAllowedQueries;
+    public array | null $pagerAllowedQueries = null;
 
     public function convertCase(string $value, string $case) : string
     {

diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -542,6 +542,11 @@ public function testPagerQuery() : void
     public function testPagerAllowedQueries() : void
     {
         $_SERVER['REQUEST_URI'] = '/products?page=5&foo=bar&order=asc&bla=bla&per_page=10';
+        $this->model->paginate(5);
+        self::assertSame(
+            'http://localhost:8080/products?page=5&foo=bar&order=asc&bla=bla&per_page=10',
+            $this->model->getPager()->getCurrentPageUrl()
+        );
         $this->model->pagerAllowedQueries = ['order', 'per_page'];
         $this->model->paginate(5);
         self::assertSame(