|
9 | 9 | use Illuminate\Contracts\Support\Responsable; |
10 | 10 | use Illuminate\Http\JsonResponse; |
11 | 11 | use Illuminate\Http\Request; |
12 | | -use Illuminate\Http\Resources\Json\JsonResource; |
13 | | -use Illuminate\Http\Resources\Json\ResourceResponse; |
14 | 12 | use Illuminate\Support\Arr; |
15 | 13 | use Illuminate\Support\Facades\App; |
16 | 14 | use Illuminate\Support\Facades\Response as ResponseFactory; |
@@ -257,7 +255,7 @@ public function resolvePropertyInstances(array $props, Request $request): array |
257 | 255 | DeferProp::class, |
258 | 256 | AlwaysProp::class, |
259 | 257 | MergeProp::class, |
260 | | - ])->first(fn($class) => $value instanceof $class); |
| 258 | + ])->first(fn ($class) => $value instanceof $class); |
261 | 259 |
|
262 | 260 | if ($resolveViaApp) { |
263 | 261 | $value = App::call($value); |
@@ -309,22 +307,22 @@ public function resolveMergeProps(Request $request): array |
309 | 307 | { |
310 | 308 | $resetProps = collect(explode(',', $request->header(Header::RESET, ''))); |
311 | 309 | $mergeProps = collect($this->props) |
312 | | - ->filter(fn($prop) => $prop instanceof Mergeable) |
313 | | - ->filter(fn($prop) => $prop->shouldMerge()) |
314 | | - ->filter(fn($_, $key) => ! $resetProps->contains($key)); |
| 310 | + ->filter(fn ($prop) => $prop instanceof Mergeable) |
| 311 | + ->filter(fn ($prop) => $prop->shouldMerge()) |
| 312 | + ->filter(fn ($_, $key) => ! $resetProps->contains($key)); |
315 | 313 |
|
316 | 314 | $deepMergeProps = $mergeProps |
317 | | - ->filter(fn($prop) => $prop->shouldDeepMerge()) |
| 315 | + ->filter(fn ($prop) => $prop->shouldDeepMerge()) |
318 | 316 | ->keys(); |
319 | 317 |
|
320 | 318 | $mergeProps = $mergeProps |
321 | | - ->filter(fn($prop) => ! $prop->shouldDeepMerge()) |
| 319 | + ->filter(fn ($prop) => ! $prop->shouldDeepMerge()) |
322 | 320 | ->keys(); |
323 | 321 |
|
324 | 322 | return array_filter([ |
325 | 323 | 'mergeProps' => $mergeProps->toArray(), |
326 | 324 | 'deepMergeProps' => $deepMergeProps->toArray(), |
327 | | - ], fn($prop) => count($prop) > 0); |
| 325 | + ], fn ($prop) => count($prop) > 0); |
328 | 326 | } |
329 | 327 |
|
330 | 328 | public function resolveDeferredProps(Request $request): array |
|
0 commit comments