|
@@ -434,12 +434,12 @@ discard block |
|
|
block discarded – undo |
|
434
|
434
|
$wantIncludeKeys = $includes->baseKeys() ?: $transformer->getDefaultIncludes(); |
|
435
|
435
|
|
|
436
|
436
|
// Find the keys that are declared in the $includes of the transformer |
|
437
|
|
- $mappedIncludeKeys = array_filter($wantIncludeKeys, function ($includeKey) use ($availableIncludeKeys) { |
|
|
437
|
+ $mappedIncludeKeys = array_filter($wantIncludeKeys, function($includeKey) use ($availableIncludeKeys) { |
|
438
|
438
|
return \in_array($includeKey, $availableIncludeKeys, true); |
|
439
|
439
|
}); |
|
440
|
440
|
|
|
441
|
441
|
// We can consider our props anything that has not been mapped |
|
442
|
|
- $filterProps = array_filter($wantIncludeKeys, function ($includeKey) use ($mappedIncludeKeys) { |
|
|
442
|
+ $filterProps = array_filter($wantIncludeKeys, function($includeKey) use ($mappedIncludeKeys) { |
|
443
|
443
|
return !\in_array($includeKey, $mappedIncludeKeys, true); |
|
444
|
444
|
}); |
|
445
|
445
|
|
|
@@ -458,7 +458,7 @@ discard block |
|
|
block discarded – undo |
|
458
|
458
|
|
|
459
|
459
|
// Filter the sparse field-set |
|
460
|
460
|
if (!empty($filterProps)) { |
|
461
|
|
- $filteredData = array_filter($data, function ($key) use ($filterProps) { |
|
|
461
|
+ $filteredData = array_filter($data, function($key) use ($filterProps) { |
|
462
|
462
|
return \in_array($key, $filterProps, true); |
|
463
|
463
|
}, ARRAY_FILTER_USE_KEY); |
|
464
|
464
|
|
Please login to merge, or discard this patch.