Merge pull request #72 from byCedric/feature/limit-returns-integer

Parameters' `getLimit` returns integer or null
tobyzerner · Dec 2, 2015 · fd5c667 · fd5c667
2 parents d802eac + 82e8ad4
commit fd5c667
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Parameters.php b/src/Parameters.php
@@ -96,13 +96,13 @@ protected function getOffsetFromNumber($perPage)
      * Get the limit.
      *
      * @param int|null $max
-     * @return string
+     * @return int|null
      */
     public function getLimit($max = null)
     {
-        $limit = $this->getPage('limit') ?: $this->getPage('size');
+        $limit = $this->getPage('limit') ?: $this->getPage('size') ?: null;
 
-        if ($max) {
+        if ($limit && $max) {
             $limit = min($max, $limit);
         }
 

diff --git a/tests/ParametersTest.php b/tests/ParametersTest.php
@@ -86,6 +86,13 @@ public function testGetLimitParsesThePageLimit()
         $this->assertEquals(100, $parameters->getLimit());
     }
 
+    public function testGetLimitReturnsNullWhenNotSet()
+    {
+        $parameters = new Parameters(['page' => ['offset' => 50]]);
+
+        $this->assertNull($parameters->getLimit());
+    }
+
     public function testGetFieldsReturnsAllFields()
     {
         $parameters = new Parameters(['fields' => ['posts' => 'title,content', 'users' => 'name']]);