Small refactor for consistency + Extended tests

Author: pascalbaljet

src/Response.php

@@ -309,16 +309,16 @@ public function resolveCacheDirections(Request $request): array
 
     public function resolveMergeProps(Request $request): array
     {
-        $resetProps = collect(explode(',', $request->header(Header::RESET, '')));
-        $onlyProps = collect(explode(',', $request->header(Header::PARTIAL_ONLY, '')))->filter();
-        $exceptProps = collect(explode(',', $request->header(Header::PARTIAL_EXCEPT, '')));
+        $resetProps = array_filter(explode(',', $request->header(Header::RESET, '')));
+        $onlyProps = array_filter(explode(',', $request->header(Header::PARTIAL_ONLY, '')));
+        $exceptProps = array_filter(explode(',', $request->header(Header::PARTIAL_EXCEPT, '')));
 
         $mergeProps = collect($this->props)
             ->filter(fn ($prop) => $prop instanceof Mergeable)
             ->filter(fn ($prop) => $prop->shouldMerge())
-            ->filter(fn ($_, $key) => ! $resetProps->contains($key))
-            ->filter(fn ($_, $key) => $onlyProps->isEmpty() || $onlyProps->contains($key))
-            ->filter(fn ($_, $key) => ! $exceptProps->contains($key));
+            ->reject(fn ($_, $key) => in_array($key, $resetProps))
+            ->filter(fn ($_, $key) => count($onlyProps) === 0 || in_array($key, $onlyProps))
+            ->reject(fn ($_, $key) => in_array($key, $exceptProps));
 
         $deepMergeProps = $mergeProps
             ->filter(fn ($prop) => $prop->shouldDeepMerge())

tests/ResponseTest.php

@@ -346,6 +346,8 @@ public function test_exclude_merge_props_from_partial_only_response(): void
         $this->assertInstanceOf(JsonResponse::class, $response);
 
         $this->assertSame('Jonathan', $props['user']->name);
+        $this->assertArrayNotHasKey('foo', $props);
+        $this->assertArrayNotHasKey('bar', $props);
         $this->assertFalse(isset($page->mergeProps));
     }
 
@@ -375,6 +377,8 @@ public function test_exclude_merge_props_from_partial_except_response(): void
         $this->assertInstanceOf(JsonResponse::class, $response);
 
         $this->assertSame('Jonathan', $props['user']->name);
+        $this->assertArrayNotHasKey('foo', $props);
+        $this->assertArrayHasKey('bar', $props);
         $this->assertSame(['bar'], $page->mergeProps);
     }