@@ -63,22 +63,22 @@ |
||
| 63 | 63 | ->setModelIdInputName($this->name . '[' . $k . '][modelId]') |
| 64 | 64 | ->setFields($this->fields->clone()->map(function (Field $field) use ($k, $fragment) { |
| 65 | 65 | return $field->name($this->name . '.' . $k . '.' . $field->getName()) |
| 66 | - ->localizedFormat(':name.:locale') |
|
| 67 | - ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) { |
|
| 68 | - if (isset($field->value)) { |
|
| 69 | - return $field->value; |
|
| 70 | - } |
|
| 71 | - |
|
| 72 | - if ($field instanceof MediaField) { |
|
| 73 | - if (!$fragment->hasModelId()) { |
|
| 74 | - return []; |
|
| 75 | - } |
|
| 76 | - |
|
| 77 | - return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale); |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - return $fragment->getValue($field->getColumn(), $locale); |
|
| 81 | - }); |
|
| 66 | + ->localizedFormat(':name.:locale') |
|
| 67 | + ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) { |
|
| 68 | + if (isset($field->value)) { |
|
| 69 | + return $field->value; |
|
| 70 | + } |
|
| 71 | + |
|
| 72 | + if ($field instanceof MediaField) { |
|
| 73 | + if (!$fragment->hasModelId()) { |
|
| 74 | + return []; |
|
| 75 | + } |
|
| 76 | + |
|
| 77 | + return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale); |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + return $fragment->getValue($field->getColumn(), $locale); |
|
| 81 | + }); |
|
| 82 | 82 | })); |
| 83 | 83 | } |
| 84 | 84 | |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | // Model is auto-injected by Manager::editFields() method. |
| 49 | 49 | if (($this->model)) { |
| 50 | 50 | if (!method_exists($this->model, 'getFragments')) { |
| 51 | - throw new \RuntimeException(get_class($this->model) . ' is missing the ' . HasFragments::class . ' trait.'); |
|
| 51 | + throw new \RuntimeException(get_class($this->model).' is missing the '.HasFragments::class.' trait.'); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | if (count($modelFragments = $this->model->getFragments($this->getKey())) > 0) { |
| 55 | - $fragments = $modelFragments->map(function (FragmentModel $fragmentModel) { |
|
| 55 | + $fragments = $modelFragments->map(function(FragmentModel $fragmentModel) { |
|
| 56 | 56 | return Fragment::fromModel($fragmentModel); |
| 57 | 57 | })->all(); |
| 58 | 58 | } |
@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | foreach ($fragments as $k => $fragment) { |
| 62 | 62 | $fragments[$k] = $fragments[$k] |
| 63 | - ->setModelIdInputName($this->name . '[' . $k . '][modelId]') |
|
| 64 | - ->setFields($this->fields->clone()->map(function (Field $field) use ($k, $fragment) { |
|
| 65 | - return $field->name($this->name . '.' . $k . '.' . $field->getName()) |
|
| 63 | + ->setModelIdInputName($this->name.'['.$k.'][modelId]') |
|
| 64 | + ->setFields($this->fields->clone()->map(function(Field $field) use ($k, $fragment) { |
|
| 65 | + return $field->name($this->name.'.'.$k.'.'.$field->getName()) |
|
| 66 | 66 | ->localizedFormat(':name.:locale') |
| 67 | - ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) { |
|
| 67 | + ->valueResolver(function($model = null, $locale = null, $field) use ($fragment) { |
|
| 68 | 68 | if (isset($field->value)) { |
| 69 | 69 | return $field->value; |
| 70 | 70 | } |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | // Take the fields from the first fragment as a starting point for duplication |
| 113 | - return array_map(function (\Thinktomorrow\Chief\Fields\Types\Field $field) { |
|
| 114 | - return $field->valueResolver(function ($model = null, $locale = null, $field) { |
|
| 113 | + return array_map(function(\Thinktomorrow\Chief\Fields\Types\Field $field) { |
|
| 114 | + return $field->valueResolver(function($model = null, $locale = null, $field) { |
|
| 115 | 115 | if ($field instanceof \Thinktomorrow\Chief\Fields\Types\MediaField) { |
| 116 | 116 | return []; |
| 117 | 117 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | public static function fromModel(FragmentModel $fragmentModel): self |
| 36 | 36 | { |
| 37 | - return new static($fragmentModel->key, $fragmentModel->values->all(), new Fields(), (int) $fragmentModel->id); |
|
| 37 | + return new static($fragmentModel->key, $fragmentModel->values->all(), new Fields(), (int)$fragmentModel->id); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public static function fromNew(string $key, array $values): self |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $modelId = $payload['modelId']; |
| 57 | 57 | unset($payload['modelId']); |
| 58 | 58 | |
| 59 | - return new static($key, $payload, new Fields(), (int) $modelId); |
|
| 59 | + return new static($key, $payload, new Fields(), (int)$modelId); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | public function setFields(Fields $fields): self |
@@ -13,15 +13,15 @@ |
||
| 13 | 13 | public function saveFragmentFields(FragmentField $fragmentField, Request $request) |
| 14 | 14 | { |
| 15 | 15 | $payload = $request->input($fragmentField->getDottedName(), []); |
| 16 | - $imagePayload = $request->input('images.' . $fragmentField->getDottedName(), []); |
|
| 16 | + $imagePayload = $request->input('images.'.$fragmentField->getDottedName(), []); |
|
| 17 | 17 | |
| 18 | 18 | // Compose Fragment instances for each payload entry |
| 19 | - $fragments = array_map(function ($fragmentPayload) use ($fragmentField) { |
|
| 19 | + $fragments = array_map(function($fragmentPayload) use ($fragmentField) { |
|
| 20 | 20 | return Fragment::fromRequestPayload($fragmentField->getKey(), $fragmentPayload); // (new Fragment($field->getKey(), $fragmentPayload)); |
| 21 | 21 | }, $payload); |
| 22 | 22 | |
| 23 | 23 | // remove all dead fragments |
| 24 | - $this->existingModel()->removeAllFragments($fragmentField->getKey(), array_map(function (Fragment $fragment) { |
|
| 24 | + $this->existingModel()->removeAllFragments($fragmentField->getKey(), array_map(function(Fragment $fragment) { |
|
| 25 | 25 | return $fragment->hasModelId() ? $fragment->getModelId() : null; |
| 26 | 26 | }, $fragments)); |
| 27 | 27 | |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | |
| 23 | 23 | $value = is_null($value) ? [] : (is_array($value) ? $value : json_decode($value, true)); |
| 24 | 24 | |
| 25 | - return new static((array) $value); |
|
| 25 | + return new static((array)$value); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | public function has(string $key): bool |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | { |
| 21 | 21 | return (new static(new FieldType(FieldType::IMAGE), $key)) |
| 22 | 22 | ->locales([config('app.fallback_locale', 'nl')]) |
| 23 | - ->valueResolver(function ($model = null, $locale = null, ImageField $field) { |
|
| 23 | + ->valueResolver(function($model = null, $locale = null, ImageField $field) { |
|
| 24 | 24 | return $field->getMedia($model, $locale); |
| 25 | 25 | }); |
| 26 | 26 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $images = []; |
| 40 | 40 | $locale = $locale ?? app()->getLocale(); |
| 41 | 41 | |
| 42 | - $assets = $model->assetRelation->where('pivot.type', $this->getKey())->filter(function ($asset) use ($locale) { |
|
| 42 | + $assets = $model->assetRelation->where('pivot.type', $this->getKey())->filter(function($asset) use ($locale) { |
|
| 43 | 43 | return $asset->pivot->locale == $locale; |
| 44 | 44 | })->sortBy('pivot.order'); |
| 45 | 45 | |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | */ |
| 264 | 264 | private function defaultEloquentValueResolver(): \Closure |
| 265 | 265 | { |
| 266 | - return function (Model $model = null, $locale = null) { |
|
| 266 | + return function(Model $model = null, $locale = null) { |
|
| 267 | 267 | if ($this->value) { |
| 268 | 268 | return $this->value; |
| 269 | 269 | } |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | |
| 421 | 421 | return $this->isLocalized() |
| 422 | 422 | ? 'chief::back._formgroups.fieldgroup_translatable' |
| 423 | - : 'chief::back._fields.' . $this->type->get(); |
|
| 423 | + : 'chief::back._fields.'.$this->type->get(); |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | public function viewData(array $viewData = []): Field |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | { |
| 22 | 22 | return (new static(new FieldType(FieldType::FILE), $key)) |
| 23 | 23 | ->locales([config('app.fallback_locale', 'nl')]) |
| 24 | - ->valueResolver(function ($model = null, $locale = null, FileField $field) { |
|
| 24 | + ->valueResolver(function($model = null, $locale = null, FileField $field) { |
|
| 25 | 25 | return $field->getMedia($model, $locale); |
| 26 | 26 | }); |
| 27 | 27 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $files = []; |
| 36 | 36 | $locale = $locale ?? app()->getLocale(); |
| 37 | 37 | |
| 38 | - $assets = $model->assetRelation->where('pivot.type', $this->getKey())->filter(function ($asset) use ($locale) { |
|
| 38 | + $assets = $model->assetRelation->where('pivot.type', $this->getKey())->filter(function($asset) use ($locale) { |
|
| 39 | 39 | return $asset->pivot->locale == $locale; |
| 40 | 40 | })->sortBy('pivot.order'); |
| 41 | 41 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | continue; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - $method = 'get' . ucfirst($key); |
|
| 95 | + $method = 'get'.ucfirst($key); |
|
| 96 | 96 | |
| 97 | 97 | // Reject from list if value does not match expected one |
| 98 | 98 | if ($value && $value == $field->$method()) { |
@@ -108,30 +108,30 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | public function render(): string |
| 110 | 110 | { |
| 111 | - return array_reduce($this->fields, function (string $carry, Field $field) { |
|
| 112 | - return $carry . $field->render(); |
|
| 111 | + return array_reduce($this->fields, function(string $carry, Field $field) { |
|
| 112 | + return $carry.$field->render(); |
|
| 113 | 113 | }, ''); |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | public function keyed($key): Fields |
| 117 | 117 | { |
| 118 | - $keys = (array) $key; |
|
| 118 | + $keys = (array)$key; |
|
| 119 | 119 | |
| 120 | - return new static(array_filter($this->fields, function (Field $field) use ($keys) { |
|
| 120 | + return new static(array_filter($this->fields, function(Field $field) use ($keys) { |
|
| 121 | 121 | return in_array($field->getKey(), $keys); |
| 122 | 122 | })); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | public function tagged($tag): Fields |
| 126 | 126 | { |
| 127 | - return new static(array_filter($this->fields, function (Field $field) use ($tag) { |
|
| 127 | + return new static(array_filter($this->fields, function(Field $field) use ($tag) { |
|
| 128 | 128 | return $field->tagged($tag); |
| 129 | 129 | })); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | public function untagged(): Fields |
| 133 | 133 | { |
| 134 | - return new static(array_filter($this->fields, function (Field $field) { |
|
| 134 | + return new static(array_filter($this->fields, function(Field $field) { |
|
| 135 | 135 | return $field->untagged(); |
| 136 | 136 | })); |
| 137 | 137 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | public function offsetGet($offset) |
| 174 | 174 | { |
| 175 | 175 | if (!isset($this->fields[$offset])) { |
| 176 | - throw new \RuntimeException('No field found by key [' . $offset . ']'); |
|
| 176 | + throw new \RuntimeException('No field found by key ['.$offset.']'); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | return $this->fields[$offset]; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | public function offsetSet($offset, $value) |
| 183 | 183 | { |
| 184 | 184 | if (!$value instanceof Field) { |
| 185 | - throw new \InvalidArgumentException('Passed value must be of type ' . Field::class); |
|
| 185 | + throw new \InvalidArgumentException('Passed value must be of type '.Field::class); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | $this->fields[$offset] = $value; |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | |
| 213 | 213 | private function validateFields(array $fields) |
| 214 | 214 | { |
| 215 | - array_map(function (Field $field) { |
|
| 215 | + array_map(function(Field $field) { |
|
| 216 | 216 | }, $fields); |
| 217 | 217 | } |
| 218 | 218 | |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | if ($reference->hasFragmentKey()) { |
| 28 | 28 | if (!$field instanceof FragmentField) { |
| 29 | - throw new \RuntimeException('Field ' . $field->getKey() . ' was expected to be a fragmentfield but its not.'); |
|
| 29 | + throw new \RuntimeException('Field '.$field->getKey().' was expected to be a fragmentfield but its not.'); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | $firstFragment = $field->getFragments()[0]; |