Less strict property validation #1887

getkirby · Oct 7, 2019 · c712ef0 · c712ef0
1 parent f8ea132
commit c712ef0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 34 deletions.
diff --git a/src/Toolkit/Pagination.php b/src/Toolkit/Pagination.php
@@ -386,27 +386,27 @@ public function rangeEnd(int $range = 5): int
     public function setProperties(array $params)
     {
         if (isset($params['limit'])) {
-            if (is_int($params['limit']) !== true || $params['limit'] < 1) {
+            if (is_numeric($params['limit']) !== true || $params['limit'] < 1) {
                 throw new Exception('Invalid pagination limit: ' . $params['limit']);
             }
 
-            $this->limit = $params['limit'];
+            $this->limit = (int)$params['limit'];
         }
 
         if (isset($params['total'])) {
-            if (is_int($params['total']) !== true || $params['total'] < 0) {
+            if (is_numeric($params['total']) !== true || $params['total'] < 0) {
                 throw new Exception('Invalid total number of items: ' . $params['total']);
             }
 
-            $this->total = $params['total'];
+            $this->total = (int)$params['total'];
         }
 
         if (isset($params['page'])) {
-            if (is_int($params['page']) !== true || $params['page'] < 0) {
+            if (is_numeric($params['page']) !== true || $params['page'] < 0) {
                 throw new Exception('Invalid page number: ' . $params['page']);
             }
 
-            $this->page = $params['page'];
+            $this->page = (int)$params['page'];
         } elseif ($this->page === null) {
             // generate "default page" based on other params if not set already
             $this->page = $this->firstPage();

diff --git a/tests/Toolkit/PaginationTest.php b/tests/Toolkit/PaginationTest.php
@@ -303,15 +303,6 @@ public function testSetPropertiesInvalid1()
     }
 
     public function testSetPropertiesInvalid2()
-    {
-        $this->expectException('Kirby\Exception\Exception');
-        $this->expectExceptionMessage('Invalid pagination limit: 1');
-
-        $pagination = new Pagination();
-        $pagination->setProperties(['limit' => '1']);
-    }
-
-    public function testSetPropertiesInvalid3()
     {
         $this->expectException('Kirby\Exception\Exception');
         $this->expectExceptionMessage('Invalid total number of items: -1');
@@ -320,16 +311,7 @@ public function testSetPropertiesInvalid3()
         $pagination->setProperties(['total' => -1]);
     }
 
-    public function testSetPropertiesInvalid4()
-    {
-        $this->expectException('Kirby\Exception\Exception');
-        $this->expectExceptionMessage('Invalid total number of items: 1');
-
-        $pagination = new Pagination();
-        $pagination->setProperties(['total' => '1']);
-    }
-
-    public function testSetPropertiesInvalid5()
+    public function testSetPropertiesInvalid3()
     {
         $this->expectException('Kirby\Exception\Exception');
         $this->expectExceptionMessage('Invalid page number: -1');
@@ -338,15 +320,6 @@ public function testSetPropertiesInvalid5()
         $pagination->setProperties(['page' => -1]);
     }
 
-    public function testSetPropertiesInvalid6()
-    {
-        $this->expectException('Kirby\Exception\Exception');
-        $this->expectExceptionMessage('Invalid page number: 1');
-
-        $pagination = new Pagination();
-        $pagination->setProperties(['page' => '1']);
-    }
-
     public function testSetPropertiesOutOfBounds1()
     {
         $this->expectException('Kirby\Exception\ErrorPageException');