[Bugfix] Ensure empty sort and include params pass validation

Closes #518

Author: lindyhopchris

CHANGELOG.md

@@ -12,6 +12,8 @@ All notable changes to this project will be documented in this file. This projec
 Resolve model bindings correctly when substituting URL parameters.
 - Updated type-hinting for `Responses::errros()` method and allowed a `null` default
 status code to be passed to `Helpers::httpErrorStatus()` method.
+- [#518](https://github.com/cloudcreativity/laravel-json-api/issues/518)
+Ensure empty `sort` and `include` query parameters pass validation.
 
 ## [2.0.0-beta.3] - 2020-04-13
 

src/Validation/AbstractValidators.php

@@ -655,6 +655,7 @@ protected function defaultQueryRules(): array
             ],
             'include' => [
                 'bail',
+                'nullable',
                 'string',
                 $this->allowedIncludePaths(),
             ],
@@ -665,6 +666,7 @@ protected function defaultQueryRules(): array
             ],
             'sort' => [
                 'bail',
+                'nullable',
                 'string',
                 $this->allowedSortParameters(),
             ],

tests/lib/Integration/Eloquent/ResourceTest.php

@@ -67,6 +67,15 @@ public function testSortedSearch()
             ->assertFetchedManyInOrder([$b, $a]);
     }
 
+    public function testEmptySort(): void
+    {
+        $posts = factory(Post::class, 2)->create();
+
+        $this->jsonApi()
+            ->get('api/v1/posts?sort=')
+            ->assertFetchedMany($posts);
+    }
+
     public function testFilteredSearch()
     {
         $a = factory(Post::class)->create([
@@ -329,6 +338,18 @@ public function testReadWithInclude()
             ->assertIsIncluded('tags', $tag);
     }
 
+    /**
+     * @see https://github.com/cloudcreativity/laravel-json-api/issues/518
+     */
+    public function testReadWithEmptyInclude(): void
+    {
+        $post = factory(Post::class)->create();
+
+        $this->jsonApi()
+            ->get("api/v1/posts/{$post->getRouteKey()}?include=")
+            ->assertFetchedOne($this->serialize($post));
+    }
+
     /**
      * @see https://github.com/cloudcreativity/laravel-json-api/issues/194
      */