Skip to content

Commit 822e426

Browse files
committed
1 parent 84e009b commit 822e426

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

.editorconfig

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*.php]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true
8+
indent_style = space
9+
indent_size = 4

src/ServiceProvider.php

+9-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Database\Eloquent\Relations\HasMany;
66
use Illuminate\Support\ServiceProvider as BaseServiceProvider;
7+
use Illuminate\Support\Arr;
78

89
class ServiceProvider extends BaseServiceProvider
910
{
@@ -45,7 +46,7 @@ public function boot()
4546

4647
// Get any non-matching rows.
4748
$deletedKeys = array_diff($current, $castKeys(
48-
array_pluck($data, $relatedKeyName))
49+
Arr::pluck($data, $relatedKeyName))
4950
);
5051

5152
if ($deleting && count($deletedKeys) > 0) {
@@ -55,13 +56,13 @@ public function boot()
5556

5657
// Separate the submitted data into "update" and "new"
5758
// We determine "newRows" as those whose $relatedKeyName (usually 'id') is null.
58-
$newRows = array_where($data, function ($row) use ($relatedKeyName) {
59-
return array_get($row, $relatedKeyName) === null;
59+
$newRows = Arr::where($data, function ($row) use ($relatedKeyName) {
60+
return Arr::get($row, $relatedKeyName) === null;
6061
});
6162

6263
// We determine "updateRows" as those whose $relatedKeyName (usually 'id') is set, not null.
63-
$updatedRows = array_where($data, function ($row) use ($relatedKeyName) {
64-
return array_get($row, $relatedKeyName) !== null;
64+
$updatedRows = Arr::where($data, function ($row) use ($relatedKeyName) {
65+
return Arr::get($row, $relatedKeyName) !== null;
6566
});
6667

6768
if (count($newRows) > 0) {
@@ -72,12 +73,12 @@ public function boot()
7273
}
7374

7475
foreach ($updatedRows as $row) {
75-
$this->getRelated()->where($relatedKeyName, $castKey(array_get($row, $relatedKeyName)))
76-
->first()
76+
$this->getRelated()->where($relatedKeyName, $castKey(Arr::get($row, $relatedKeyName)))
77+
->first()
7778
->update($row);
7879
}
7980

80-
$changes['updated'] = $castKeys(array_pluck($updatedRows, $relatedKeyName));
81+
$changes['updated'] = $castKeys(Arr::pluck($updatedRows, $relatedKeyName));
8182

8283
return $changes;
8384
});

0 commit comments

Comments
 (0)