Merge pull request #62 from ifduyue/patch-1

Make negetive page[size] exception safe

Author: freekmurze

src/JsonApiPaginateServiceProvider.php

@@ -37,8 +37,14 @@ protected function registerMacro()
 
             $size = (int) request()->input($paginationParameter.'.'.$sizeParameter, $defaultSize);
 
-            $size = $size > $maxResults ? $maxResults : $size;
-
+            if ($size <= 0) {
+                $size = $defaultSize;
+            }
+            
+            if ($size > $maxResults) {
+                $size = $maxResults;
+            }
+            
             $paginator = $this
                 ->{$paginationMethod}($size, ['*'], $paginationParameter.'.'.$numberParameter)
                 ->setPageName($paginationParameter.'['.$numberParameter.']')

tests/RequestTest.php

@@ -47,4 +47,34 @@ public function it_will_use_the_configured_page_number_parameter()
 
         $response->assertJsonFragment(['current_page' => 2]);
     }
+
+    /** @test */
+    public function it_will_use_default_size_when_page_size_is_zero()
+    {
+        $default_size = config('json-api-paginate.default_size');
+
+        $response = $this->get('/?page[size]=0');
+
+        $response->assertJsonFragment(['per_page' => $default_size]);
+    }
+
+    /** @test */
+    public function it_will_use_default_size_when_page_size_is_negative()
+    {
+        $default_size = config('json-api-paginate.default_size');
+
+        $response = $this->get('/?page[size]=-1');
+
+        $response->assertJsonFragment(['per_page' => $default_size]);
+    }
+
+    /** @test */
+    public function it_will_use_default_size_when_page_size_is_illegal()
+    {
+        $default_size = config('json-api-paginate.default_size');
+
+        $response = $this->get('/?page[size]=Rpfwj5N1b7');
+
+        $response->assertJsonFragment(['per_page' => $default_size]);
+    }
 }