Merge pull request #103 from josecl/main

Prepends 'application/json' to 'Accept' header

Author: alexzarbn

src/Concerns/HandlesRelationStandardOperations.php

@@ -210,6 +210,18 @@ protected function afterIndex(Request $request, Model $parentEntity, $entities)
         return null;
     }
 
+    /**
+     * Filters, sorts, and fetches the list of resources.
+     *
+     * @param Request $request
+     * @param $parentKey
+     * @return CollectionResource
+     */
+    public function search(Request $request, $parentKey)
+    {
+        return $this->index($request, $parentKey);
+    }
+
     /**
      * Create new relation resource.
      *

src/Http/Middleware/EnforceExpectsJson.php

@@ -13,7 +13,10 @@ class EnforceExpectsJson
      */
     public function handle(Request $request, $next)
     {
-        $request->headers->add(['Accept' => 'application/json']);
+        if (strpos($request->header('Accept'), 'application/json') !== 0) {
+            $request->headers->add(['Accept' => 'application/json,' . $request->header('Accept')]);
+        }
+
         return $next($request);
     }
 }

tests/Unit/Http/Middleware/EnforceExpectsJsonTest.php

@@ -16,7 +16,7 @@ public function adding_accept_header()
         (new EnforceExpectsJson())->handle(
             $request,
             function ($processedRequest) {
-                $this->assertEquals('application/json', $processedRequest->header('Accept'));
+                $this->assertTrue($processedRequest->expectsJson());
             }
         );
     }