Skip to content

Commit 64f426a

Browse files
dvlppdvlpp
committed
Code formatting
1 parent 2f3961d commit 64f426a

File tree

4 files changed

+75
-66
lines changed

4 files changed

+75
-66
lines changed

‎src/Form/Fields/Formatters/AutocompleteListFormatter.php‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ function toFront(SharpFormField $field, $value)
1616
{
1717
$autocompleteField = $field->autocompleteField();
1818

19-
return collect($value)->map(function ($item) use($field, $autocompleteField) {
20-
return [
21-
$autocompleteField->itemIdAttribute() => $item[$autocompleteField->itemIdAttribute()],
22-
$autocompleteField->key() => $autocompleteField->formatter()->toFront(
23-
$autocompleteField, $item
24-
)
25-
];
26-
})->all();
19+
return collect($value)
20+
->map(function ($item) use($field, $autocompleteField) {
21+
return [
22+
$autocompleteField->itemIdAttribute() => $item[$autocompleteField->itemIdAttribute()],
23+
$autocompleteField->key() => $autocompleteField->formatter()->toFront(
24+
$autocompleteField, $item
25+
)
26+
];
27+
})
28+
->all();
2729
}
2830

2931
/**
@@ -36,14 +38,16 @@ function fromFront(SharpFormField $field, string $attribute, $value)
3638
{
3739
$autocompleteField = $field->autocompleteField();
3840

39-
return collect($value)->map(function ($item) use($field, $autocompleteField) {
40-
$item = $item[$autocompleteField->key()];
41-
42-
return [
43-
$autocompleteField->itemIdAttribute() => $autocompleteField->formatter()->fromFront(
44-
$autocompleteField, $autocompleteField->key(), $item
45-
)
46-
];
47-
})->all();
41+
return collect($value)
42+
->map(function ($item) use($field, $autocompleteField) {
43+
$item = $item[$autocompleteField->key()];
44+
45+
return [
46+
$autocompleteField->itemIdAttribute() => $autocompleteField->formatter()->fromFront(
47+
$autocompleteField, $autocompleteField->key(), $item
48+
)
49+
];
50+
})
51+
->all();
4852
}
4953
}

‎src/Form/Fields/Formatters/ListFormatter.php‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,25 @@ class ListFormatter extends SharpFieldFormatter
1414
*/
1515
function toFront(SharpFormField $field, $value)
1616
{
17-
return collect($value)->map(function ($item) use($field) {
18-
$itemArray = [
19-
$field->itemIdAttribute() => $item[$field->itemIdAttribute()]
20-
];
17+
return collect($value)
18+
->map(function ($item) use($field) {
19+
$itemArray = [
20+
$field->itemIdAttribute() => $item[$field->itemIdAttribute()]
21+
];
2122

22-
$field->itemFields()->each(function($itemField) use($item, &$itemArray) {
23-
$key = $itemField->key();
23+
$field
24+
->itemFields()
25+
->each(function($itemField) use($item, &$itemArray) {
26+
$key = $itemField->key();
2427

25-
$itemArray[$key] = isset($item[$key])
26-
? $itemField->formatter()->toFront($itemField, $item[$key])
27-
: null;
28-
});
28+
$itemArray[$key] = isset($item[$key])
29+
? $itemField->formatter()->toFront($itemField, $item[$key])
30+
: null;
31+
});
2932

30-
return $itemArray;
31-
32-
})->all();
33+
return $itemArray;
34+
})
35+
->all();
3336
}
3437

3538
/**
@@ -40,23 +43,24 @@ function toFront(SharpFormField $field, $value)
4043
*/
4144
function fromFront(SharpFormField $field, string $attribute, $value)
4245
{
43-
return collect($value)->map(function ($item) use($field) {
44-
$itemArray = [
45-
$field->itemIdAttribute() => $item[$field->itemIdAttribute()]
46-
];
47-
48-
foreach($item as $key => $value) {
49-
$itemField = $field->findItemFormFieldByKey($key);
50-
51-
if($itemField) {
52-
$itemArray[$key] = $itemField->formatter()
53-
->setInstanceId($this->instanceId)
54-
->fromFront($itemField, $key, $value);
55-
}
56-
}
46+
return collect($value)
47+
->map(function ($item) use($field) {
48+
$itemArray = [
49+
$field->itemIdAttribute() => $item[$field->itemIdAttribute()]
50+
];
5751

58-
return $itemArray;
52+
foreach($item as $key => $value) {
53+
$itemField = $field->findItemFormFieldByKey($key);
54+
55+
if($itemField) {
56+
$itemArray[$key] = $itemField->formatter()
57+
->setInstanceId($this->instanceId)
58+
->fromFront($itemField, $key, $value);
59+
}
60+
}
5961

60-
})->all();
62+
return $itemArray;
63+
})
64+
->all();
6165
}
6266
}

‎src/Form/Fields/Formatters/TagsFormatter.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,28 @@ function fromFront(SharpFormField $field, string $attribute, $value)
4747
return is_null($item["id"]) || isset($options[$item["id"]]);
4848
})
4949

50-
->when(! $field->creatable(), function($collection) {
51-
// Field isn't creatable, let's just strip all null ids
52-
return $collection->filter(function($item) {
53-
return !is_null($item["id"]);
54-
});
55-
})
50+
->when(! $field->creatable(), function($collection) {
51+
// Field isn't creatable, let's just strip all null ids
52+
return $collection->filter(function($item) {
53+
return !is_null($item["id"]);
54+
});
55+
})
5656

57-
->map(function($item) use($field) {
58-
if(is_null($item["id"])) {
59-
return array_merge([
60-
$field->idAttribute() => null,
61-
$field->createAttribute() => $item["label"]
62-
], $field->createAdditionalAttributes()
63-
);
64-
}
57+
->map(function($item) use($field) {
58+
if(is_null($item["id"])) {
59+
return array_merge([
60+
$field->idAttribute() => null,
61+
$field->createAttribute() => $item["label"]
62+
], $field->createAdditionalAttributes()
63+
);
64+
}
6565

66-
return [
67-
$field->idAttribute() => $item["id"]
68-
];
66+
return [
67+
$field->idAttribute() => $item["id"]
68+
];
6969

70-
})
71-
->values()
72-
->all();
70+
})
71+
->values()
72+
->all();
7373
}
7474
}

‎src/Utils/Transformers/ArrayConverter.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static function modelToArray($model)
2626
return (array)$model;
2727
}
2828

29+
// Model is not a structured data. We return it as it is.
2930
return $model;
3031
}
3132
}

0 commit comments

Comments
 (0)