Split methods into separate setters and getters

src/Auth/AccessControl/AbstractQuery.php

@@ -1,53 +1,28 @@
-<?php
+<?php declare(strict_types=1);
 namespace Imbo\Auth\AccessControl;
 
 /**
  * Abstract query interface for access control
  */
 abstract class AbstractQuery {
-    /**
-     * Limit
-     *
-     * @var int
-     */
-    private $limit = 20;
-
-    /**
-     * Page
-     *
-     * @var int
-     */
-    private $page = 1;
-
-    /**
-     * Set or get the limit
-     *
-     * @param int $limit The limit to set. Skip to get the current value
-     * @return self|int
-     */
-    public function limit($limit = null) {
-        if ($limit === null) {
-            return $this->limit;
-        }
-
-        $this->limit = (int) $limit;
+    private int $limit = 20;
+    private int $page = 1;
 
+    public function setLimit(int $limit): self {
+        $this->limit = $limit;
         return $this;
     }
 
-    /**
-     * Set or get the page
-     *
-     * @param int $page The page to set. Skip to get the current value
-     * @return self|int
-     */
-    public function page($page = null) {
-        if ($page === null) {
-            return $this->page;
-        }
-
-        $this->page = (int) $page;
+    public function getLimit(): int {
+        return $this->limit;
+    }
 
+    public function setPage(int $page): self {
+        $this->page = $page;
         return $this;
     }
+
+    public function getPage(): int {
+        return $this->page;
+    }
 }

src/Auth/AccessControl/Adapter/ArrayAdapter.php

@@ -48,8 +48,8 @@ public function __construct(array $accessList = [], $groups = []) {
     public function getGroups(GroupQuery $query, GroupsModel $model): array {
         $model->setHits(count($this->groups));
 
-        $offset = ($query->page() - 1) * $query->limit();
-        return array_slice($this->groups, $offset, $query->limit(), true);
+        $offset = ($query->getPage() - 1) * $query->getLimit();
+        return array_slice($this->groups, $offset, $query->getLimit(), true);
     }
 
     public function groupExists(string $groupName): bool {

src/Auth/AccessControl/Adapter/MongoDB.php

@@ -114,8 +114,8 @@ public function __construct(array $params = null, MongoClient $client = null, Mo
     public function getGroups(GroupQuery $query, GroupsModel $model): array {
         $cursor = $this->getGroupsCollection()
             ->find([], [
-                'skip' => ($query->page() - 1) * $query->limit(),
-                'limit' => $query->limit(),
+                'skip' => ($query->getPage() - 1) * $query->getLimit(),
+                'limit' => $query->getLimit(),
             ]);
 
         $groups = [];

tests/Auth/AccessControl/Adapter/ArrayAdapterTest.php

@@ -181,8 +181,8 @@ public function getGroupsData() : array {
                 ['g1' => [], 'g2' => [], 'g3' => [], 'g4' => [], 'g5' => []],
                 ['g3' => [], 'g4' => []],
                 (new GroupQuery())
-                    ->page(2)
-                    ->limit(2),
+                    ->setPage(2)
+                    ->setLimit(2),
             ],
         ];
     }

tests/Auth/AccessControl/GroupQueryTest.php

@@ -14,20 +14,22 @@ public function setUp() : void {
     }
 
     /**
-     * @covers ::limit
+     * @covers ::setLimit
+     * @covers ::getLimit
      */
     public function testSetAndGetLimit() : void {
-        $this->assertSame(20, $this->query->limit());
-        $this->assertSame($this->query, $this->query->limit(10));
-        $this->assertSame(10, $this->query->limit());
+        $this->assertSame(20, $this->query->getLimit());
+        $this->assertSame($this->query, $this->query->setLimit(10));
+        $this->assertSame(10, $this->query->getLimit());
     }
 
     /**
-     * @covers ::page
+     * @covers ::setPage
+     * @covers ::getPage
      */
     public function testSetAndGetPage() : void {
-        $this->assertSame(1, $this->query->page());
-        $this->assertSame($this->query, $this->query->page(2));
-        $this->assertSame(2, $this->query->page());
+        $this->assertSame(1, $this->query->getPage());
+        $this->assertSame($this->query, $this->query->setPage(2));
+        $this->assertSame(2, $this->query->getPage());
     }
 }