raise an error for pages < 1. #11230

Pages should start at 1. raise an error for pages < 1. issue: #11230
cakephp · Sep 25, 2017 · 825b454 · 825b454
1 parent 8c41449
commit 825b454
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -1259,9 +1259,14 @@ public function orHaving($conditions, $types = [])
      * @param int|null $limit The number of rows you want in the page. If null
      *  the current limit clause will be used.
      * @return $this
+     * @throws \InvalidArgumentException If page number < 1.
      */
     public function page($num, $limit = null)
     {
+        if ($num < 1) {
+            $msg = 'Pages should start at 1.';
+            throw new InvalidArgumentException($msg);
+        }
         if ($limit !== null) {
             $this->limit($limit);
         }

diff --git a/src/Datasource/QueryInterface.php b/src/Datasource/QueryInterface.php
@@ -240,6 +240,7 @@ public function order($fields, $overwrite = false);
      * @param int|null $limit The number of rows you want in the page. If null
      *  the current limit clause will be used.
      * @return $this
+     * @throws \InvalidArgumentException If page number < 1.
      */
     public function page($num, $limit = null);
 

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -2206,6 +2206,21 @@ public function testSelectOffset()
         $this->assertTrue($dirty);
     }
 
+    /**
+     * Test Pages number.
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Pages should start at 1.
+     * @return void
+     */
+    public function testPageShouldStartAtOne()
+    {
+        $this->loadFixtures('Comments');
+        $query = new Query($this->connection);
+        $result = $query->from('comments')
+                        ->page(0);
+    }
+
     /**
      * Test selecting rows using the page() method.
      *